diff --git a/common/src/comp/body/object.rs b/common/src/comp/body/object.rs
index f4addede0b..4ffaec7afc 100644
--- a/common/src/comp/body/object.rs
+++ b/common/src/comp/body/object.rs
@@ -237,6 +237,7 @@ impl Body {
             Reagent::Green => Body::FireworkGreen,
             Reagent::Purple => Body::FireworkPurple,
             Reagent::Red => Body::FireworkRed,
+            Reagent::White => Body::FireworkWhite,
             Reagent::Yellow => Body::FireworkYellow,
         }
     }
diff --git a/server/src/events/inventory_manip.rs b/server/src/events/inventory_manip.rs
index 8ef548c367..c1c9f8f450 100644
--- a/server/src/events/inventory_manip.rs
+++ b/server/src/events/inventory_manip.rs
@@ -644,18 +644,7 @@ pub fn handle_inventory(server: &mut Server, entity: EcsEntity, manip: comp::Inv
         let mut new_entity = state
             .create_object(Default::default(), match kind {
                 item::Throwable::Bomb => comp::object::Body::Bomb,
-<<<<<<< HEAD
                 item::Throwable::Firework(reagent) => comp::object::Body::for_firework(reagent),
-=======
-                item::Throwable::Firework(reagent) => match reagent {
-                    item::Reagent::Blue => comp::object::Body::FireworkBlue,
-                    item::Reagent::Green => comp::object::Body::FireworkGreen,
-                    item::Reagent::Purple => comp::object::Body::FireworkPurple,
-                    item::Reagent::Red => comp::object::Body::FireworkRed,
-                    item::Reagent::White => comp::object::Body::FireworkWhite,
-                    item::Reagent::Yellow => comp::object::Body::FireworkYellow,
-                },
->>>>>>> added a white firework
                 item::Throwable::TrainingDummy => comp::object::Body::TrainingDummy,
             })
             .with(comp::Pos(pos.0 + Vec3::unit_z() * 0.25))