fixing bug on conflict solver
small changes for making work on UI easier
Merge branch 'polishing-perdate-corpus' into relational-storage