fixed code error
resolved merge