Committing after pain of resolving conflicts