remove event-capacity(update your database to allow null), rearrange stuff
merge conflict