hier_merge changes