re #44 added a table to store the information when a conflict happens
re #44 now when a conflict appears, we save it in the conflicts table, though we do nothing with it yet
re #44 added a page to display a conflict, this page is empty yet