Removes merge conflict diff.