Remove duplicate merge
Merge pull request #13791 from kei-s/remove_duplicate_merge

Remove duplicate merge