Fix merge conflicts when trying to merge main into forest

Enemies/Flaming Skull.tscn

@@ -3,6 +3,7 @@
 [ext_resource path="res://Resources/Level_5_Enemy_Glowing_Ghost_Occluder.tres" type="OccluderPolygon2D" id=1]
 [ext_resource path="res://Sprites/Assets/Light.png" type="Texture" id=2]
 [ext_resource path="res://Enemies/Flaming Skull.gd" type="Script" id=4]
+<<<<<<< HEAD
 [ext_resource path="res://Sprites/Enemies/flaming skull design.png" type="Texture" id=5]
 
 [sub_resource type="AtlasTexture" id=1]
@@ -20,11 +21,34 @@ region = Rect2( 1344, 0, 672, 672 )
 [sub_resource type="SpriteFrames" id=4]
 animations = [ {
 "frames": [ SubResource( 1 ), SubResource( 2 ), SubResource( 3 ) ],
+=======
+[ext_resource path="res://Sprites/Enemies/Flaming_Skull_Design.png" type="Texture" id=5]
+
+[sub_resource type="AtlasTexture" id=3]
+flags = 4
+atlas = ExtResource( 5 )
+region = Rect2( 0, 0, 672, 672 )
+
+[sub_resource type="AtlasTexture" id=4]
+flags = 4
+atlas = ExtResource( 5 )
+region = Rect2( 672, 0, 672, 672 )
+
+[sub_resource type="AtlasTexture" id=5]
+flags = 4
+atlas = ExtResource( 5 )
+region = Rect2( 1344, 0, 672, 672 )
+
+[sub_resource type="SpriteFrames" id=6]
+animations = [ {
+"frames": [ SubResource( 3 ), SubResource( 4 ), SubResource( 5 ) ],
+>>>>>>> main
 "loop": true,
 "name": "default",
 "speed": 5.0
 } ]
 
+<<<<<<< HEAD
 [sub_resource type="CapsuleShape2D" id=5]
 radius = 3.0
 height = 2.0
@@ -35,18 +59,33 @@ radius = 50.0
 [node name="Flaming Skull" type="KinematicBody2D" groups=[
 "enemies",
 ]]
+=======
+[sub_resource type="CapsuleShape2D" id=1]
+radius = 3.0
+height = 2.0
+
+[sub_resource type="CircleShape2D" id=2]
+radius = 50.0
+
+[node name="Flaming Skull" type="KinematicBody2D" groups=["enemies"]]
+>>>>>>> main
 collision_layer = 2
 script = ExtResource( 4 )
 
 [node name="AnimatedSprite" type="AnimatedSprite" parent="."]
 scale = Vector2( 0.0446429, 0.0446429 )
+<<<<<<< HEAD
 frames = SubResource( 4 )
 frame = 1
+=======
+frames = SubResource( 6 )
+>>>>>>> main
 playing = true
 
 [node name="Hitbox" type="CollisionShape2D" parent="."]
 visible = false
 position = Vector2( 0, -3 )
+<<<<<<< HEAD
 shape = SubResource( 5 )
 
 [node name="Player Detector" type="Area2D" parent="."]
@@ -58,6 +97,19 @@ collision_mask = 2
 [node name="CollisionShape2D" type="CollisionShape2D" parent="Player Detector"]
 visible = false
 shape = SubResource( 6 )
+=======
+shape = SubResource( 1 )
+
+[node name="Player Detector" type="Area2D" parent="."]
+collision_layer = 0
+collision_mask = 2
+input_pickable = false
+monitorable = false
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="Player Detector"]
+visible = false
+shape = SubResource( 2 )
+>>>>>>> main
 
 [node name="Light2D" type="Light2D" parent="."]
 visible = false