merges from hg