commiting for conflict