Fixed wrong resolved merge conflict.