fixed merge conflicts 11/10
fixed merge conflict in schema
deleted booleans out of event model