Remove merge conflict file