Bump stories in an event
Fix merge conflicts