Remove the merge conflict file