commit changes before merge