How to upmerge/rebase to master?

Is it a github problem maybe? I think the file itselfs are flagged as renamed