merge for hg
merge from hg