Merge conflict defeated.