local commit before merge