fixing merging issues: original hashes always take priority - per alps