Remove duplicate code added in merge.