Fixed badly resolved merge conflicts