Last updated before merge