fixed conflict solver and other issues with the new structure
Merge branch '282-rules-experimenter' into relational-storage