comit to expect conflict