diff --git a/Assets/Models/Animated.meta b/Assets/Models/Animated.meta
index 5a0c97cbd..d52e4b928 100644
--- a/Assets/Models/Animated.meta
+++ b/Assets/Models/Animated.meta
@@ -1,9 +1,5 @@
 fileFormatVersion: 2
-<<<<<<< HEAD:Assets/BossRoom/GameData/Action/Boss.meta
-guid: 3475ba239bdef5c41a29797d5db6bed5
-=======
 guid: d17afa65ef0bdf04aa0887465a3a1005
->>>>>>> origin/develop:Assets/BossRoom/Models/Animated.meta
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}
diff --git a/Assets/Scripts/ConnectionManagement/ConnectionMethod.cs b/Assets/Scripts/ConnectionManagement/ConnectionMethod.cs
index 3ccffda8c..1e343fa01 100644
--- a/Assets/Scripts/ConnectionManagement/ConnectionMethod.cs
+++ b/Assets/Scripts/ConnectionManagement/ConnectionMethod.cs
@@ -102,10 +102,10 @@ public override void SetupClientConnection()
             utp.SetConnectionData(m_Ipaddress, m_Port);
         }
 
-        public override async Task<(bool success, bool shouldTryAgain)> SetupClientReconnectionAsync()
+        public override Task<(bool success, bool shouldTryAgain)> SetupClientReconnectionAsync()
         {
             // Nothing to do here
-            return (true, true);
+            return Task.FromResult((true, true));
         }
 
         public override void SetupHostConnection()
diff --git a/Assets/Scripts/ConnectionManagement/ConnectionState/ClientConnectingState.cs b/Assets/Scripts/ConnectionManagement/ConnectionState/ClientConnectingState.cs
index 7039afae1..8f2d6625a 100644
--- a/Assets/Scripts/ConnectionManagement/ConnectionState/ClientConnectingState.cs
+++ b/Assets/Scripts/ConnectionManagement/ConnectionState/ClientConnectingState.cs
@@ -55,7 +55,7 @@ void StartingClientFailed()
             m_ConnectionManager.ChangeState(m_ConnectionManager.m_Offline);
         }
 
-        internal async Task ConnectClientAsync()
+        internal void ConnectClientAsync()
         {
             try
             {
diff --git a/Assets/Scripts/ConnectionManagement/ConnectionState/ClientReconnectingState.cs b/Assets/Scripts/ConnectionManagement/ConnectionState/ClientReconnectingState.cs
index 90f6e8c3d..48689712a 100644
--- a/Assets/Scripts/ConnectionManagement/ConnectionState/ClientReconnectingState.cs
+++ b/Assets/Scripts/ConnectionManagement/ConnectionState/ClientReconnectingState.cs
@@ -122,8 +122,7 @@ IEnumerator ReconnectCoroutine()
             if (!reconnectingSetupTask.IsFaulted && reconnectingSetupTask.Result.success)
             {
                 // If this fails, the OnClientDisconnect callback will be invoked by Netcode
-                var connectingTask = ConnectClientAsync();
-                yield return new WaitUntil(() => connectingTask.IsCompleted);
+                ConnectClientAsync();
             }
             else
             {
diff --git a/Assets/Textures/UI/button_Disabled.png.meta b/Assets/Textures/UI/button_Disabled.png.meta
index 3be36ce55..e0c9ac4f4 100644
--- a/Assets/Textures/UI/button_Disabled.png.meta
+++ b/Assets/Textures/UI/button_Disabled.png.meta
@@ -1,9 +1,5 @@
 fileFormatVersion: 2
-<<<<<<< HEAD:Assets/BossRoom/Textures/UI/button_Disabled.png.meta
 guid: 830c96afe1b19f9408d5ead518a09fe9
-=======
-guid: 62d7fb22c0ec4164f9c6ef1c5846ca8c
->>>>>>> origin/release/v0.1.0-experimental:Assets/BossRoom/Textures/Environment/env_deco_boss_arena_mtl.tga.meta
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 20ba92700..86c99dc4c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,9 +22,13 @@ Additional documentation and release notes are available at [Multiplayer Documen
   * com.unity.multiplayer.playmode from v1.3.2 to v1.3.3
   * com.unity.multiplayer.tools from v2.2.1 to v2.2.3
   * com.unity.netcode.gameobjects from v2.0.0 to v2.1.1
+* VContainer package upgraded from v1.11.0 to v1.14.0 (#896) This upgrade removes warning messages related to IL weaving as code gen is refactored in v1.14.0
 
 ### Cleanup
 * Removed ParrelSync from the project (#890)
+* Removed warnings on first project launch (#896) Included:
+  * Asset meta files with merge conflicts resolved
+  * RenderGraph compatibility mode disabled
 
 ### Fixed
 * Fix a Healer ability doesn't work (#893)
diff --git a/Packages/manifest.json b/Packages/manifest.json
index e7da95ec1..69594422a 100644
--- a/Packages/manifest.json
+++ b/Packages/manifest.json
@@ -23,7 +23,7 @@
     "com.unity.toolchain.macos-x86_64-linux-x86_64": "2.0.10",
     "com.unity.transport": "2.4.0",
     "com.unity.ugui": "2.0.0",
-    "jp.hadashikick.vcontainer": "1.11.0",
+    "jp.hadashikick.vcontainer": "1.14.0",
     "com.unity.modules.accessibility": "1.0.0",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",
diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
index af933a82e..09c32dfd1 100644
--- a/Packages/packages-lock.json
+++ b/Packages/packages-lock.json
@@ -450,12 +450,10 @@
       }
     },
     "jp.hadashikick.vcontainer": {
-      "version": "1.11.0",
+      "version": "1.14.0",
       "depth": 0,
       "source": "registry",
-      "dependencies": {
-        "com.unity.nuget.mono-cecil": "1.10.1"
-      },
+      "dependencies": {},
       "url": "https://package.openupm.com"
     },
     "com.unity.modules.accessibility": {