fixing events bug plus adding organizer attendee
resolving merge conflict