US79445: resolved merge conflict