Updates to merge policy