Fix conflicts

crates/bevy_ecs/src/lifecycle.rs

@@ -54,8 +54,8 @@ use crate::{
     component::{Component, ComponentId, ComponentIdFor, Tick},
     entity::Entity,
     event::{
-        BufferedEvent, EntityEvent, Event, EventCursor, EventId, EventIterator,
-        EventIteratorWithId, EventKey, Events,
+        BufferedEvent, EntityEvent, EventCursor, EventId, EventIterator, EventIteratorWithId,
+        EventKey, Events,
     },
     query::FilteredAccessSet,
     relationship::RelationshipHookMode,

examples/ui/scroll.rs

@@ -50,7 +50,7 @@ fn send_scroll_events(
 }
 
 /// UI scrolling event.
-#[derive(Event, EntityEvent, Debug)]
+#[derive(EntityEvent, Debug)]
 #[entity_event(auto_propagate, traversal = &'static ChildOf)]
 struct Scroll {
     /// Scroll delta in logical coordinates.