saving merge from hg