Fixed bad resolved merge