Remove files created by merge conflict