edit event migration
remove old event columns from event views
merge conflict