diff --git a/Assets/Fish-Networking-Discovery-main/NetworkDiscovery.cs b/Assets/Fish-Networking-Discovery-main/NetworkDiscovery.cs
index e4ec54f1..979aab11 100644
--- a/Assets/Fish-Networking-Discovery-main/NetworkDiscovery.cs
+++ b/Assets/Fish-Networking-Discovery-main/NetworkDiscovery.cs
@@ -242,7 +242,11 @@ namespace FishNet.Discovery
 			//
 			// 	return;
 			// }
+<<<<<<< HEAD
 			Debug.Log("NetworkDiscovery is searching");
+=======
+			// Debug.Log("NetworkDiscovery is searching on port " + port);
+>>>>>>> master
 
 			if (InstanceFinder.IsClient)
 			{
diff --git a/Assets/Prefabs.meta b/Assets/Prefabs.meta
index c658b528..d20487b8 100644
--- a/Assets/Prefabs.meta
+++ b/Assets/Prefabs.meta
@@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<<< HEAD:Assets/Prefabs.meta
 guid: f5d758e3acccf474babdbe217a2702ba
+========
+guid: b75b31ee55930864c993630f33293a65
+>>>>>>>> master:Assets/_PROJECT/Components/Bolt.meta
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}
diff --git a/Assets/Scripts.meta b/Assets/Scripts.meta
index f8e5c645..58457d4b 100644
--- a/Assets/Scripts.meta
+++ b/Assets/Scripts.meta
@@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<<< HEAD:Assets/Scripts.meta
 guid: 8f19a044f4ee30042a6ad8c58d595f40
+========
+guid: d130522c3b40916429cacacf79ffbc9b
+>>>>>>>> master:Assets/_PROJECT/Components/Bolt/Intercation Logic.meta
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}
diff --git a/Assets/XR/Settings/OpenXR Package Settings.asset b/Assets/XR/Settings/OpenXR Package Settings.asset
deleted file mode 100644
index 4bfad9a1..00000000
--- a/Assets/XR/Settings/OpenXR Package Settings.asset	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c4dfd870243f7478ecd0558d9b6821d6952a0367b38a5c3e225896d287b4c07b
-size 26638