removing git merge info from file