Back out duplication arising from the merge