commit on merge