merging with hg branch