event dates controller
fixed merge conflict