Fix incorrectly resolved merge conflict