It compiles with the newest version of ontology
Fixed merge conflicts
It compiles