joinEvent
modals
Fixed merge conflict in CSS file
Fixed conflict in new dashboard