diff --git a/docs/core.md b/docs/core.md
index 81657e7fc6..6031086be4 100644
--- a/docs/core.md
+++ b/docs/core.md
@@ -10,24 +10,14 @@ var builder = WebApplication.CreateBuilder();
 // Add services to the container.
 builder.Services.AddControllersWithViews();
 builder.Services.AddSystemWebAdapters()
-<<<<<<< HEAD
     .AddJsonSessionKeySerializer(options => ClassLibrary.SessionUtils.RegisterSessionKeys(options))
-    .AddRemoteClientApp(remote => remote
+    .AddRemoteAppClient(remote => remote
         .Configure(options =>
         {
             options.RemoteApp = new(builder.Configuration["ReverseProxy:Clusters:fallbackCluster:Destinations:fallbackApp:Address"]);
             options.ApiKey = ClassLibrary.SessionUtils.ApiKey;
         })
-        .AddSession();
-=======
-    .AddRemoteApp(options =>
-    {
-        options.RemoteAppUrl = new(builder.Configuration["ReverseProxy:Clusters:fallbackCluster:Destinations:fallbackApp:Address"]);
-        options.ApiKey = ClassLibrary.SessionUtils.ApiKey;
-    })
-    .AddRemoteAppSession()
-    .AddJsonSessionSerializer(options => ClassLibrary.SessionUtils.RegisterSessionKeys(options));
->>>>>>> origin/main
+        .AddSession());
 
 var app = builder.Build();
 
diff --git a/docs/framework.md b/docs/framework.md
index b49b63dcfe..80c7d524a6 100644
--- a/docs/framework.md
+++ b/docs/framework.md
@@ -28,16 +28,10 @@ protected void Application_Start()
 
     SystemWebAdapterConfiguration.AddSystemWebAdapters(this)
         .AddProxySupport(options => options.UseForwardedHeaders = true)
-<<<<<<< HEAD
-        .AddJsonSessionSerializer(options => ClassLibrary.RemoteServiceUtils.RegisterSessionKeys(options.KnownKeys))
+        .AddJsonSessionSerializer(options => ClassLibrary.SessionUtils.RegisterSessionKeys(options.KnownKeys))
         .AddRemoteAppServer(remote => remote
-            .Configure(options => options.ApiKey = ClassLibrary.RemoteServiceUtils.ApiKey)
+            .Configure(options => options.ApiKey = ClassLibrary.SessionUtils.ApiKey)
             .AddSession());
-=======
-        .AddRemoteApp(options => options.ApiKey = ClassLibrary.SessionUtils.ApiKey)
-        .AddRemoteAppSession()
-        .AddJsonSessionSerializer(options => ClassLibrary.SessionUtils.RegisterSessionKeys(options.KnownKeys));
->>>>>>> origin/main
 }
 ```