merge hg branch