Merge conflicts

Author: BoxyUwU

crates/bevy_app/src/app_builder.rs

@@ -4,9 +4,8 @@ use crate::{
     CoreStage, PluginGroup, PluginGroupBuilder, StartupStage,
 };
 use bevy_ecs::{
-    component::{Component, ComponentDescriptor},
-    event::Events,
     component::{Component, StorageType},
+    event::Events,
     schedule::{
         RunOnce, Schedule, Stage, StageLabel, State, SystemDescriptor, SystemSet, SystemStage,
     },

crates/bevy_ecs/src/lib.rs

@@ -18,7 +18,6 @@ pub mod prelude {
         bundle::Bundle,
         entity::Entity,
         event::{EventReader, EventWriter},
-        query::{Added, ChangeTrackers, Changed, Or, QueryState, With, WithBundle, Without},
         query::{
             Added, ChangeTrackers, Changed, Or, QueryRelationFilter, QueryState, Relation, With,
             WithBundle, Without,