last minute before merge