Commit for conflict