[FIX] resolved merge issues