Remove trace of poorly resolved merge