Proper buttons in merge (with Save/Ignore updates)