Fixed merge conflict in event_builder
Fixed merge conflict in default_master.json