doc: resolved merge conflict