merger from hg