Fix merge conflicts when trying to merge main into forest

Enemies/Flaming Skull.gd

@@ -7,6 +7,7 @@ var velocity: Vector2 = Vector2.ZERO
 
 
 func _physics_process(_delta: float) -> void:
+<<<<<<< HEAD
 	velocity = Vector2.ZERO
 
 	if player:
@@ -26,3 +27,24 @@ func _on_player_detector_area_entered(area: Area2D) -> void:
 func _on_player_detector_area_exited(_area: Area2D):
 	player = null
 	return
+=======
+    velocity = Vector2.ZERO
+
+    if player:
+        velocity = position.direction_to(player.position).normalized() * SPEED
+
+    velocity = move_and_slide(velocity)
+    return
+
+
+func _on_player_detector_area_entered(area: Area2D) -> void:
+    if area.get_parent().name == 'Player':
+        player = area.get_parent()
+
+    return
+
+
+func _on_player_detector_area_exited(_area: Area2D):
+    player = null
+    return
+>>>>>>> main