Add merging for events

Have teams and locations merge before a event gets persisted.