merge with hg