remove file automatically created by git merge