Delete files that came back after a broken git merge