removes git merge marker