fixing merge conflicts
Merge branch 'jeremyhintz-finishing-event-details'
fixing more merge conflicts and removing errors