diff --git a/magic/Projectiles/EcoProjectile.tscn b/magic/Projectiles/EcoProjectile.tscn
index a4b4051..56003d4 100644
--- a/magic/Projectiles/EcoProjectile.tscn
+++ b/magic/Projectiles/EcoProjectile.tscn
@@ -8,7 +8,11 @@ radius = 5.0
 
 [node name="EcoProjectile" type="KinematicBody2D"]
 collision_layer = 8
+<<<<<<< HEAD
 collision_mask = 2
+=======
+collision_mask = 6
+>>>>>>> master
 script = ExtResource( 2 )
 
 [node name="Sprite" type="Sprite" parent="."]
diff --git a/magic/Projectiles/PhantomProjectile.tscn b/magic/Projectiles/PhantomProjectile.tscn
index 45e38c9..2c00726 100644
--- a/magic/Projectiles/PhantomProjectile.tscn
+++ b/magic/Projectiles/PhantomProjectile.tscn
@@ -8,7 +8,11 @@ radius = 5.0
 height = 2.0
 
 [node name="PhantomProjectile" type="KinematicBody2D"]
+<<<<<<< HEAD
 collision_layer = 8
+=======
+collision_layer = 2147483656
+>>>>>>> master
 collision_mask = 6
 script = ExtResource( 2 )