Add conflicts viewer