resolved merge errors 2