changes to git merge file