Merge conflict incorrectly fixed