Saving everything before merge