adding categories to events/new
fixing merge conflict