Change a file that was changed in another branch