All changes to MERGE and UP design