Events Controller 

I updated the events controller to merge.