diff --git a/content/codespaces/customizing-your-codespace/index.md b/content/codespaces/customizing-your-codespace/index.md
index 4445731cac..74e740a4d5 100644
--- a/content/codespaces/customizing-your-codespace/index.md
+++ b/content/codespaces/customizing-your-codespace/index.md
@@ -12,15 +12,9 @@ topics:
 children:
   - /personalizing-codespaces-for-your-account
   - /changing-the-machine-type-for-your-codespace
-<<<<<<< HEAD
-  - /setting-your-default-editor-for-github-codespaces
-  - /setting-your-default-region-for-github-codespaces
-  - /setting-your-timeout-period-for-github-codespaces
-=======
   - /setting-your-default-editor-for-codespaces
   - /setting-your-default-region-for-codespaces
   - /setting-your-timeout-period-for-codespaces
   - /configuring-automatic-deletion-of-your-codespaces
->>>>>>> main
 ---
  
diff --git a/content/codespaces/customizing-your-codespace/setting-your-timeout-period-for-github-codespaces.md b/content/codespaces/customizing-your-codespace/setting-your-timeout-period-for-github-codespaces.md
index eba3f50566..8655d421fd 100644
--- a/content/codespaces/customizing-your-codespace/setting-your-timeout-period-for-github-codespaces.md
+++ b/content/codespaces/customizing-your-codespace/setting-your-timeout-period-for-github-codespaces.md
@@ -1,25 +1,14 @@
 ---
-<<<<<<< HEAD:content/codespaces/customizing-your-codespace/setting-your-timeout-period-for-github-codespaces.md
-title: Setting your timeout period for GitHub Codespaces
-intro: 'You can set your default timeout for {% data variables.product.prodname_github_codespaces %} in your personal settings page.'
-=======
 title: Setting your timeout period for Codespaces
 shortTitle: Set the timeout
 intro: 'You can set your default timeout for {% data variables.product.prodname_codespaces %} in your personal settings page.'
->>>>>>> main:content/codespaces/customizing-your-codespace/setting-your-timeout-period-for-codespaces.md
 product: '{% data reusables.gated-features.codespaces %}'
 versions:
   fpt: '*'
   ghec: '*'
 topics:
   - Codespaces
-<<<<<<< HEAD:content/codespaces/customizing-your-codespace/setting-your-timeout-period-for-github-codespaces.md
-shortTitle: Set the timeout
-redirect_from:
-  - /codespaces/customizing-your-codespace/setting-your-timeout-period-for-codespaces
-=======
 type: how_to
->>>>>>> main:content/codespaces/customizing-your-codespace/setting-your-timeout-period-for-codespaces.md
 ---
 
 A codespace will stop running after a period of inactivity. You can specify the length of this timeout period. The updated setting will apply to any newly created codespace.
diff --git a/content/codespaces/prebuilding-your-codespaces/about-github-codespaces-prebuilds.md b/content/codespaces/prebuilding-your-codespaces/about-github-codespaces-prebuilds.md
index 90289d4cd4..f709aca80a 100644
--- a/content/codespaces/prebuilding-your-codespaces/about-github-codespaces-prebuilds.md
+++ b/content/codespaces/prebuilding-your-codespaces/about-github-codespaces-prebuilds.md
@@ -1,11 +1,7 @@
 ---
 title: About GitHub Codespaces prebuilds
 shortTitle: About prebuilds
-<<<<<<< HEAD:content/codespaces/prebuilding-your-codespaces/about-github-codespaces-prebuilds.md
-intro: GitHub Codespaces prebuilds help to speed up the creation of new codespaces.
-=======
 intro: Codespaces prebuilds help to speed up the creation of new codespaces for large or complex repositories.
->>>>>>> main:content/codespaces/prebuilding-your-codespaces/about-codespaces-prebuilds.md
 versions:
   fpt: '*'
   ghec: '*'