Fix merge conflicts in event views.