commit before merge