fixed wrong resolved merge conflict