diff --git a/epymorph/initializer.py b/epymorph/initializer.py
index dc9803fd..89b5210e 100644
--- a/epymorph/initializer.py
+++ b/epymorph/initializer.py
@@ -269,12 +269,12 @@ def bottom_locations(ctx: InitContext, attribute: str, num_locations: int, seed_
     selection = np.argpartition(arr, num_locations)[:num_locations]
     return indexed_locations(ctx, selection, seed_size)
 
-<<<<<<< HEAD
-=======
+
+
 def bird_movement_initializer(ctx: SimContext)->NDArray[SimDType]:
     result = ctx.geo['bird_population'].reshape((ctx.nodes, ctx.compartments)) # type: ignore
     return result.astype(SimDType)
->>>>>>> 1605ad4 (Simulation Notebook)
+