commit to expect conflict