commit before merge
merge