Add conflicts variable