merge for hg