fixed merge conflicts and updated event form
ran migration