Commiting for a conflict