changed controller for events
fixed merge conflict