git merge conflict removed