Updates to merge process