Adding merge action to modules.hg