Fixing more merge conflicts

Enemies/Flaming Skull.gd

@@ -10,27 +10,6 @@ var counter: int = 0
 
 
 func _physics_process(_delta: float) -> void:
-<<<<<<< HEAD
-	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
-=======
     velocity = Vector2.ZERO
 
     if player and position.distance_to(player.position) > 1:
@@ -77,4 +56,3 @@ func _on_hitbox_area_entered(area: Area2D) -> void:
     if health <= 0:
         call_deferred('queue_free')
     return
->>>>>>> main