commit for conflict