merged with hg