updating before merge