diff --git a/windows/configuration/assigned-access/configure-single-app-kiosk.md b/windows/configuration/assigned-access/configure-single-app-kiosk.md
index ae4b0a9ffb..41d6cc3acc 100644
--- a/windows/configuration/assigned-access/configure-single-app-kiosk.md
+++ b/windows/configuration/assigned-access/configure-single-app-kiosk.md
@@ -7,9 +7,6 @@ ms.topic: overview
 
 # Configure a single-app kiosk with Assigned Access
 
-<<<<<<< HEAD:windows/configuration/assigned-access/configure-single-app-kiosk.md
-A single-app kiosk uses the Assigned Access feature to run a single application above the lock screen. When the kiosk account signs in, the app is launched automatically. The person using the kiosk can't do anything on the device outside of the kiosk app.
-=======
 Assigned Access is a Windows feature that you can use to configure a device as a kiosk or with a restricted user experience.
 
 When you configure a **kiosk experience**, a single Universal Windows Platform (UWP) application or Microsoft Edge is executed in full screen. Users can only use that application and once the kiosk app is closed, it automatically restarts. Practical examples include:
@@ -36,7 +33,6 @@ Here are the requirements for Assigned Access:
 [!INCLUDE [assigned-access](../../../includes/licensing/assigned-access.md)]
 
 ## Configure a kiosk experience
->>>>>>> 29fc1e82cb8d18c0059926e1e862a382aa6ae7a9:windows/configuration/assigned-access/overview.md
 
 There are several options to configure a kiosk experience. If you need to configure a single device with a local account, you can use:
 
diff --git a/windows/configuration/assigned-access/index.md b/windows/configuration/assigned-access/index.md
index 826278169e..f61ce30d5a 100644
--- a/windows/configuration/assigned-access/index.md
+++ b/windows/configuration/assigned-access/index.md
@@ -23,12 +23,7 @@ When you configure a **restricted user experience**, users can only execute a de
 > [!NOTE]
 > When you configure a restricted user experience, different policy settings are applied to the device. Some policy settings apply to standard users only, and some to administrator accounts too. For more information, see [Assigned Access policy settings](policy-settings.md).
 
-<<<<<<< HEAD
 ## Requirements
-=======
-- **Assigned Access**: used to execute a single Universal Windows Platform (UWP) app or Microsoft Edge in full screen. When the kiosk account signs in, the kiosk app launches automatically. If the UWP app is closed, it automatically restarts
-- **Shell Launcher**: used to configure a device to execute a Windows desktop application as the user interface. The specified application replaces the default Windows shell (`Explorer.exe`) that usually runs when a user signs in
->>>>>>> 29fc1e82cb8d18c0059926e1e862a382aa6ae7a9
 
 Here are the requirements for Assigned Access:
 
diff --git a/windows/configuration/assigned-access/toc.yml b/windows/configuration/assigned-access/toc.yml
index 658f482baf..994d64e36d 100644
--- a/windows/configuration/assigned-access/toc.yml
+++ b/windows/configuration/assigned-access/toc.yml
@@ -3,12 +3,8 @@ items:
   href: index.md
 - name: Configure a single-app kiosk
   href: configure-single-app-kiosk.md
-- name: 🔴 Single-app kiosk (merged ↖️)
-  href: single-app-kiosk.md
 - name: Configure a multi-app kiosk
   href: configure-multi-app-kiosk.md
-- name: 🔴 Multi-app kiosk (merged ↖️)
-  href: multi-app-kiosk.md
 - name: Recommendations
   href: recommendations.md
 - name: Create a configuration file