updating again before merge