Merge conflict, continued.