merge from hg