add category_id to Events
fix conflicts