diff --git a/scenes/player.tscn b/scenes/player.tscn
index 29725f7..88452b1 100644
--- a/scenes/player.tscn
+++ b/scenes/player.tscn
@@ -1,11 +1,3 @@
-<<<<<<< HEAD
-[gd_scene load_steps=2 format=3]
-
-[ext_resource type="Script" path="res://scripts/player_spawner.gd" id="1"]
-
-[node name="Player" type="CharacterBody3D"]
-script = ExtResource("1")
-=======
 [gd_scene load_steps=3 format=3 uid="uid://player_scene_001"]
 
 [ext_resource type="Script" path="res://scripts/player.gd" id="1_player"]
@@ -30,4 +22,3 @@ mesh = SubResource("CapsuleMesh1")
 [node name="Camera3D" type="Camera3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.6, 0)
 current = true
->>>>>>> origin/main
diff --git a/scenes/server.tscn b/scenes/server.tscn
index f7087cf..0653d62 100644
--- a/scenes/server.tscn
+++ b/scenes/server.tscn
@@ -1,3 +1,6 @@
-[gd_scene load_steps=1 format=3]
+[gd_scene load_steps=2 format=3]
+
+[ext_resource type="Script" path="res://scripts/server.gd" id="1_server"]
 
 [node name="Server" type="Node"]
+script = ExtResource("1_server")
diff --git a/scenes/server_player.tscn b/scenes/server_player.tscn
new file mode 100644
index 0000000..4f77f6d
--- /dev/null
+++ b/scenes/server_player.tscn
@@ -0,0 +1,6 @@
+[gd_scene load_steps=2 format=3]
+
+[ext_resource type="Script" path="res://scripts/player_spawner.gd" id="1"]
+
+[node name="Player" type="CharacterBody3D"]
+script = ExtResource("1")
diff --git a/scripts/server.gd b/scripts/server.gd
index 08d7234..fdfa38d 100644
--- a/scripts/server.gd
+++ b/scripts/server.gd
@@ -37,7 +37,7 @@ var _player_scene: PackedScene
 
 func _ready() -> void:
 	# Preload the player scene once.
-	_player_scene = preload("res://scenes/player.tscn")
+	_player_scene = preload("res://scenes/server_player.tscn")
 
 	# Create and assign the ENet server peer.
 	network_peer = _create_server_peer()