wip event bus
resolved conflicts