saving changes before merge