diff --git a/.nojekyll b/.nojekyll
index 9d2c3b9..eaeaccd 100644
--- a/.nojekyll
+++ b/.nojekyll
@@ -1 +1 @@
-0e4c91f1
\ No newline at end of file
+735a0f90
\ No newline at end of file
diff --git a/01-handson_github_website.html b/01-handson_github_website.html
index 27edacc..9bbddb3 100644
--- a/01-handson_github_website.html
+++ b/01-handson_github_website.html
@@ -164,12 +164,6 @@
   <a href="./git_cli.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Using git at the command line</span></a>
   </div>
-</li>
-          <li class="sidebar-item">
-  <div class="sidebar-item-container"> 
-  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">Managing conflicts</span></a>
-  </div>
 </li>
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
@@ -203,7 +197,7 @@
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
   <a href="./github_org.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">GitHub Organizations for your Lab</span></a>
+ <span class="menu-text">GitHub Organization for your Lab</span></a>
   </div>
 </li>
           <li class="sidebar-item">
@@ -229,6 +223,12 @@
   <a href="./02-handson_github_rstudio.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Hands-on: Branches using RStudio</span></a>
   </div>
+</li>
+          <li class="sidebar-item">
+  <div class="sidebar-item-container"> 
+  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
+ <span class="menu-text">Managing conflicts</span></a>
+  </div>
 </li>
       </ul>
   </li>
diff --git a/02-handson_github_rstudio.html b/02-handson_github_rstudio.html
index 9eca7d7..c3b743b 100644
--- a/02-handson_github_rstudio.html
+++ b/02-handson_github_rstudio.html
@@ -64,7 +64,7 @@
 <script src="site_libs/quarto-search/fuse.min.js"></script>
 <script src="site_libs/quarto-search/quarto-search.js"></script>
 <meta name="quarto:offset" content="./">
-<link href="./github_template.html" rel="next">
+<link href="./git_conflicts.html" rel="next">
 <link href="./03-handson_github_workflows.html" rel="prev">
 <script src="site_libs/quarto-html/quarto.js"></script>
 <script src="site_libs/quarto-html/popper.min.js"></script>
@@ -198,12 +198,6 @@
   <a href="./git_cli.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Using git at the command line</span></a>
   </div>
-</li>
-          <li class="sidebar-item">
-  <div class="sidebar-item-container"> 
-  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">Managing conflicts</span></a>
-  </div>
 </li>
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
@@ -237,7 +231,7 @@
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
   <a href="./github_org.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">GitHub Organizations for your Lab</span></a>
+ <span class="menu-text">GitHub Organization for your Lab</span></a>
   </div>
 </li>
           <li class="sidebar-item">
@@ -263,6 +257,12 @@
   <a href="./02-handson_github_rstudio.html" class="sidebar-item-text sidebar-link active">
  <span class="menu-text">Hands-on: Branches using RStudio</span></a>
   </div>
+</li>
+          <li class="sidebar-item">
+  <div class="sidebar-item-container"> 
+  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
+ <span class="menu-text">Managing conflicts</span></a>
+  </div>
 </li>
       </ul>
   </li>
@@ -912,8 +912,8 @@ <h2 class="anchored" data-anchor-id="is-your-fav-dessert-iconic">Is your fav’
       </a>          
   </div>
   <div class="nav-page nav-page-next">
-      <a href="./github_template.html" class="pagination-link" aria-label="Repository template">
-        <span class="nav-page-text">Repository template</span> <i class="bi bi-arrow-right-short"></i>
+      <a href="./git_conflicts.html" class="pagination-link" aria-label="Managing conflicts">
+        <span class="nav-page-text">Managing conflicts</span> <i class="bi bi-arrow-right-short"></i>
       </a>
   </div>
 </nav>
diff --git a/03-handson_github_workflows.html b/03-handson_github_workflows.html
index 97ab5d0..13c8c01 100644
--- a/03-handson_github_workflows.html
+++ b/03-handson_github_workflows.html
@@ -198,12 +198,6 @@
   <a href="./git_cli.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Using git at the command line</span></a>
   </div>
-</li>
-          <li class="sidebar-item">
-  <div class="sidebar-item-container"> 
-  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">Managing conflicts</span></a>
-  </div>
 </li>
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
@@ -237,7 +231,7 @@
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
   <a href="./github_org.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">GitHub Organizations for your Lab</span></a>
+ <span class="menu-text">GitHub Organization for your Lab</span></a>
   </div>
 </li>
           <li class="sidebar-item">
@@ -263,6 +257,12 @@
   <a href="./02-handson_github_rstudio.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Hands-on: Branches using RStudio</span></a>
   </div>
+</li>
+          <li class="sidebar-item">
+  <div class="sidebar-item-container"> 
+  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
+ <span class="menu-text">Managing conflicts</span></a>
+  </div>
 </li>
       </ul>
   </li>
diff --git a/about.html b/about.html
index 6750ffb..e45a59f 100644
--- a/about.html
+++ b/about.html
@@ -163,12 +163,6 @@
   <a href="./git_cli.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Using git at the command line</span></a>
   </div>
-</li>
-          <li class="sidebar-item">
-  <div class="sidebar-item-container"> 
-  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">Managing conflicts</span></a>
-  </div>
 </li>
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
@@ -202,7 +196,7 @@
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
   <a href="./github_org.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">GitHub Organizations for your Lab</span></a>
+ <span class="menu-text">GitHub Organization for your Lab</span></a>
   </div>
 </li>
           <li class="sidebar-item">
@@ -228,6 +222,12 @@
   <a href="./02-handson_github_rstudio.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Hands-on: Branches using RStudio</span></a>
   </div>
+</li>
+          <li class="sidebar-item">
+  <div class="sidebar-item-container"> 
+  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
+ <span class="menu-text">Managing conflicts</span></a>
+  </div>
 </li>
       </ul>
   </li>
diff --git a/coding.html b/coding.html
index 1b51e11..4d64a19 100644
--- a/coding.html
+++ b/coding.html
@@ -164,12 +164,6 @@
   <a href="./git_cli.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Using git at the command line</span></a>
   </div>
-</li>
-          <li class="sidebar-item">
-  <div class="sidebar-item-container"> 
-  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">Managing conflicts</span></a>
-  </div>
 </li>
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
@@ -203,7 +197,7 @@
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
   <a href="./github_org.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">GitHub Organizations for your Lab</span></a>
+ <span class="menu-text">GitHub Organization for your Lab</span></a>
   </div>
 </li>
           <li class="sidebar-item">
@@ -229,6 +223,12 @@
   <a href="./02-handson_github_rstudio.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Hands-on: Branches using RStudio</span></a>
   </div>
+</li>
+          <li class="sidebar-item">
+  <div class="sidebar-item-container"> 
+  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
+ <span class="menu-text">Managing conflicts</span></a>
+  </div>
 </li>
       </ul>
   </li>
diff --git a/collab_exchange.html b/collab_exchange.html
index 4d6d263..0dae17b 100644
--- a/collab_exchange.html
+++ b/collab_exchange.html
@@ -164,12 +164,6 @@
   <a href="./git_cli.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Using git at the command line</span></a>
   </div>
-</li>
-          <li class="sidebar-item">
-  <div class="sidebar-item-container"> 
-  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">Managing conflicts</span></a>
-  </div>
 </li>
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
@@ -203,7 +197,7 @@
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
   <a href="./github_org.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">GitHub Organizations for your Lab</span></a>
+ <span class="menu-text">GitHub Organization for your Lab</span></a>
   </div>
 </li>
           <li class="sidebar-item">
@@ -229,6 +223,12 @@
   <a href="./02-handson_github_rstudio.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Hands-on: Branches using RStudio</span></a>
   </div>
+</li>
+          <li class="sidebar-item">
+  <div class="sidebar-item-container"> 
+  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
+ <span class="menu-text">Managing conflicts</span></a>
+  </div>
 </li>
       </ul>
   </li>
diff --git a/collab_pairprog.html b/collab_pairprog.html
index fc88a22..1b7e675 100644
--- a/collab_pairprog.html
+++ b/collab_pairprog.html
@@ -164,12 +164,6 @@
   <a href="./git_cli.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Using git at the command line</span></a>
   </div>
-</li>
-          <li class="sidebar-item">
-  <div class="sidebar-item-container"> 
-  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">Managing conflicts</span></a>
-  </div>
 </li>
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
@@ -203,7 +197,7 @@
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
   <a href="./github_org.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">GitHub Organizations for your Lab</span></a>
+ <span class="menu-text">GitHub Organization for your Lab</span></a>
   </div>
 </li>
           <li class="sidebar-item">
@@ -229,6 +223,12 @@
   <a href="./02-handson_github_rstudio.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Hands-on: Branches using RStudio</span></a>
   </div>
+</li>
+          <li class="sidebar-item">
+  <div class="sidebar-item-container"> 
+  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
+ <span class="menu-text">Managing conflicts</span></a>
+  </div>
 </li>
       </ul>
   </li>
@@ -860,8 +860,8 @@ <h2 class="anchored" data-anchor-id="acknowledgements">Acknowledgements</h2>
       </a>          
   </div>
   <div class="nav-page nav-page-next">
-      <a href="./github_org.html" class="pagination-link" aria-label="GitHub Organizations for your Lab">
-        <span class="nav-page-text">GitHub Organizations for your Lab</span> <i class="bi bi-arrow-right-short"></i>
+      <a href="./github_org.html" class="pagination-link" aria-label="GitHub Organization for your Lab">
+        <span class="nav-page-text">GitHub Organization for your Lab</span> <i class="bi bi-arrow-right-short"></i>
       </a>
   </div>
 </nav>
diff --git a/data_mgmt.html b/data_mgmt.html
index d4e2836..1502087 100644
--- a/data_mgmt.html
+++ b/data_mgmt.html
@@ -164,12 +164,6 @@
   <a href="./git_cli.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Using git at the command line</span></a>
   </div>
-</li>
-          <li class="sidebar-item">
-  <div class="sidebar-item-container"> 
-  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">Managing conflicts</span></a>
-  </div>
 </li>
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
@@ -203,7 +197,7 @@
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
   <a href="./github_org.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">GitHub Organizations for your Lab</span></a>
+ <span class="menu-text">GitHub Organization for your Lab</span></a>
   </div>
 </li>
           <li class="sidebar-item">
@@ -229,6 +223,12 @@
   <a href="./02-handson_github_rstudio.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Hands-on: Branches using RStudio</span></a>
   </div>
+</li>
+          <li class="sidebar-item">
+  <div class="sidebar-item-container"> 
+  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
+ <span class="menu-text">Managing conflicts</span></a>
+  </div>
 </li>
       </ul>
   </li>
diff --git a/datamgmt_manage.html b/datamgmt_manage.html
index e773848..a095737 100644
--- a/datamgmt_manage.html
+++ b/datamgmt_manage.html
@@ -164,12 +164,6 @@
   <a href="./git_cli.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Using git at the command line</span></a>
   </div>
-</li>
-          <li class="sidebar-item">
-  <div class="sidebar-item-container"> 
-  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">Managing conflicts</span></a>
-  </div>
 </li>
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
@@ -203,7 +197,7 @@
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
   <a href="./github_org.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">GitHub Organizations for your Lab</span></a>
+ <span class="menu-text">GitHub Organization for your Lab</span></a>
   </div>
 </li>
           <li class="sidebar-item">
@@ -229,6 +223,12 @@
   <a href="./02-handson_github_rstudio.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Hands-on: Branches using RStudio</span></a>
   </div>
+</li>
+          <li class="sidebar-item">
+  <div class="sidebar-item-container"> 
+  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
+ <span class="menu-text">Managing conflicts</span></a>
+  </div>
 </li>
       </ul>
   </li>
diff --git a/datamgmt_plan.html b/datamgmt_plan.html
index 276d1e1..f133276 100644
--- a/datamgmt_plan.html
+++ b/datamgmt_plan.html
@@ -164,12 +164,6 @@
   <a href="./git_cli.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Using git at the command line</span></a>
   </div>
-</li>
-          <li class="sidebar-item">
-  <div class="sidebar-item-container"> 
-  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">Managing conflicts</span></a>
-  </div>
 </li>
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
@@ -203,7 +197,7 @@
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
   <a href="./github_org.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">GitHub Organizations for your Lab</span></a>
+ <span class="menu-text">GitHub Organization for your Lab</span></a>
   </div>
 </li>
           <li class="sidebar-item">
@@ -229,6 +223,12 @@
   <a href="./02-handson_github_rstudio.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Hands-on: Branches using RStudio</span></a>
   </div>
+</li>
+          <li class="sidebar-item">
+  <div class="sidebar-item-container"> 
+  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
+ <span class="menu-text">Managing conflicts</span></a>
+  </div>
 </li>
       </ul>
   </li>
diff --git a/datamgmt_prompts.html b/datamgmt_prompts.html
index 61c2f4a..b396924 100644
--- a/datamgmt_prompts.html
+++ b/datamgmt_prompts.html
@@ -164,12 +164,6 @@
   <a href="./git_cli.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Using git at the command line</span></a>
   </div>
-</li>
-          <li class="sidebar-item">
-  <div class="sidebar-item-container"> 
-  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">Managing conflicts</span></a>
-  </div>
 </li>
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
@@ -203,7 +197,7 @@
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
   <a href="./github_org.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">GitHub Organizations for your Lab</span></a>
+ <span class="menu-text">GitHub Organization for your Lab</span></a>
   </div>
 </li>
           <li class="sidebar-item">
@@ -229,6 +223,12 @@
   <a href="./02-handson_github_rstudio.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Hands-on: Branches using RStudio</span></a>
   </div>
+</li>
+          <li class="sidebar-item">
+  <div class="sidebar-item-container"> 
+  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
+ <span class="menu-text">Managing conflicts</span></a>
+  </div>
 </li>
       </ul>
   </li>
diff --git a/git_cli.html b/git_cli.html
index 1c3a8c6..0b6e99a 100644
--- a/git_cli.html
+++ b/git_cli.html
@@ -64,7 +64,7 @@
 <script src="site_libs/quarto-search/fuse.min.js"></script>
 <script src="site_libs/quarto-search/quarto-search.js"></script>
 <meta name="quarto:offset" content="./">
-<link href="./git_conflicts.html" rel="next">
+<link href="./git_further_readings.html" rel="next">
 <link href="./intro_cli.html" rel="prev">
 <script src="site_libs/quarto-html/quarto.js"></script>
 <script src="site_libs/quarto-html/popper.min.js"></script>
@@ -198,12 +198,6 @@
   <a href="./git_cli.html" class="sidebar-item-text sidebar-link active">
  <span class="menu-text">Using git at the command line</span></a>
   </div>
-</li>
-          <li class="sidebar-item">
-  <div class="sidebar-item-container"> 
-  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">Managing conflicts</span></a>
-  </div>
 </li>
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
@@ -237,7 +231,7 @@
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
   <a href="./github_org.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">GitHub Organizations for your Lab</span></a>
+ <span class="menu-text">GitHub Organization for your Lab</span></a>
   </div>
 </li>
           <li class="sidebar-item">
@@ -263,6 +257,12 @@
   <a href="./02-handson_github_rstudio.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Hands-on: Branches using RStudio</span></a>
   </div>
+</li>
+          <li class="sidebar-item">
+  <div class="sidebar-item-container"> 
+  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
+ <span class="menu-text">Managing conflicts</span></a>
+  </div>
 </li>
       </ul>
   </li>
@@ -1219,8 +1219,8 @@ <h2 class="anchored" data-anchor-id="aknowledgements">Aknowledgements</h2>
       </a>          
   </div>
   <div class="nav-page nav-page-next">
-      <a href="./git_conflicts.html" class="pagination-link" aria-label="Managing conflicts">
-        <span class="nav-page-text">Managing conflicts</span> <i class="bi bi-arrow-right-short"></i>
+      <a href="./git_further_readings.html" class="pagination-link" aria-label="Git and GitHub further readings">
+        <span class="nav-page-text">Git and GitHub further readings</span> <i class="bi bi-arrow-right-short"></i>
       </a>
   </div>
 </nav>
diff --git a/git_conflicts.html b/git_conflicts.html
index 5a4deaa..868bd3f 100644
--- a/git_conflicts.html
+++ b/git_conflicts.html
@@ -64,8 +64,8 @@
 <script src="site_libs/quarto-search/fuse.min.js"></script>
 <script src="site_libs/quarto-search/quarto-search.js"></script>
 <meta name="quarto:offset" content="./">
-<link href="./git_further_readings.html" rel="next">
-<link href="./git_cli.html" rel="prev">
+<link href="./github_template.html" rel="next">
+<link href="./02-handson_github_rstudio.html" rel="prev">
 <script src="site_libs/quarto-html/quarto.js"></script>
 <script src="site_libs/quarto-html/popper.min.js"></script>
 <script src="site_libs/quarto-html/tippy.umd.min.js"></script>
@@ -127,7 +127,7 @@
       <button type="button" class="quarto-btn-toggle btn" data-bs-toggle="collapse" role="button" data-bs-target=".quarto-sidebar-collapse-item" aria-controls="quarto-sidebar" aria-expanded="false" aria-label="Toggle sidebar navigation" onclick="if (window.quartoToggleHeadroom) { window.quartoToggleHeadroom(); }">
         <i class="bi bi-layout-text-sidebar-reverse"></i>
       </button>
-        <nav class="quarto-page-breadcrumbs" aria-label="breadcrumb"><ol class="breadcrumb"><li class="breadcrumb-item"><a href="./coding.html">Coding as a Lab</a></li><li class="breadcrumb-item"><a href="./github_intro.html">Coding together</a></li><li class="breadcrumb-item"><a href="./git_conflicts.html">Managing conflicts</a></li></ol></nav>
+        <nav class="quarto-page-breadcrumbs" aria-label="breadcrumb"><ol class="breadcrumb"><li class="breadcrumb-item"><a href="./coding.html">Coding as a Lab</a></li><li class="breadcrumb-item"><a href="./collab_exchange.html">Collaborative strategies</a></li><li class="breadcrumb-item"><a href="./git_conflicts.html">Managing conflicts</a></li></ol></nav>
         <a class="flex-grow-1" role="navigation" data-bs-toggle="collapse" data-bs-target=".quarto-sidebar-collapse-item" aria-controls="quarto-sidebar" aria-expanded="false" aria-label="Toggle sidebar navigation" onclick="if (window.quartoToggleHeadroom) { window.quartoToggleHeadroom(); }">      
         </a>
     </div>
@@ -162,13 +162,13 @@
 </li>
           <li class="sidebar-item sidebar-item-section">
       <div class="sidebar-item-container"> 
-            <a class="sidebar-item-text sidebar-link text-start" data-bs-toggle="collapse" data-bs-target="#quarto-sidebar-section-2" role="navigation" aria-expanded="true">
+            <a class="sidebar-item-text sidebar-link text-start collapsed" data-bs-toggle="collapse" data-bs-target="#quarto-sidebar-section-2" role="navigation" aria-expanded="false">
  <span class="menu-text">Coding together</span></a>
-          <a class="sidebar-item-toggle text-start" data-bs-toggle="collapse" data-bs-target="#quarto-sidebar-section-2" role="navigation" aria-expanded="true" aria-label="Toggle section">
+          <a class="sidebar-item-toggle text-start collapsed" data-bs-toggle="collapse" data-bs-target="#quarto-sidebar-section-2" role="navigation" aria-expanded="false" aria-label="Toggle section">
             <i class="bi bi-chevron-right ms-2"></i>
           </a> 
       </div>
-      <ul id="quarto-sidebar-section-2" class="collapse list-unstyled sidebar-section depth2 show">  
+      <ul id="quarto-sidebar-section-2" class="collapse list-unstyled sidebar-section depth2 ">  
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
   <a href="./github_intro.html" class="sidebar-item-text sidebar-link">
@@ -198,12 +198,6 @@
   <a href="./git_cli.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Using git at the command line</span></a>
   </div>
-</li>
-          <li class="sidebar-item">
-  <div class="sidebar-item-container"> 
-  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link active">
- <span class="menu-text">Managing conflicts</span></a>
-  </div>
 </li>
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
@@ -215,13 +209,13 @@
   </li>
           <li class="sidebar-item sidebar-item-section">
       <div class="sidebar-item-container"> 
-            <a class="sidebar-item-text sidebar-link text-start collapsed" data-bs-toggle="collapse" data-bs-target="#quarto-sidebar-section-3" role="navigation" aria-expanded="false">
+            <a class="sidebar-item-text sidebar-link text-start" data-bs-toggle="collapse" data-bs-target="#quarto-sidebar-section-3" role="navigation" aria-expanded="true">
  <span class="menu-text">Collaborative strategies</span></a>
-          <a class="sidebar-item-toggle text-start collapsed" data-bs-toggle="collapse" data-bs-target="#quarto-sidebar-section-3" role="navigation" aria-expanded="false" aria-label="Toggle section">
+          <a class="sidebar-item-toggle text-start" data-bs-toggle="collapse" data-bs-target="#quarto-sidebar-section-3" role="navigation" aria-expanded="true" aria-label="Toggle section">
             <i class="bi bi-chevron-right ms-2"></i>
           </a> 
       </div>
-      <ul id="quarto-sidebar-section-3" class="collapse list-unstyled sidebar-section depth2 ">  
+      <ul id="quarto-sidebar-section-3" class="collapse list-unstyled sidebar-section depth2 show">  
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
   <a href="./collab_exchange.html" class="sidebar-item-text sidebar-link">
@@ -237,7 +231,7 @@
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
   <a href="./github_org.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">GitHub Organizations for your Lab</span></a>
+ <span class="menu-text">GitHub Organization for your Lab</span></a>
   </div>
 </li>
           <li class="sidebar-item">
@@ -263,6 +257,12 @@
   <a href="./02-handson_github_rstudio.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Hands-on: Branches using RStudio</span></a>
   </div>
+</li>
+          <li class="sidebar-item">
+  <div class="sidebar-item-container"> 
+  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link active">
+ <span class="menu-text">Managing conflicts</span></a>
+  </div>
 </li>
       </ul>
   </li>
@@ -419,7 +419,7 @@ <h2 id="toc-title">On this page</h2>
 <!-- main -->
 <main class="content" id="quarto-document-content">
 
-<header id="title-block-header" class="quarto-title-block default"><nav class="quarto-page-breadcrumbs quarto-title-breadcrumbs d-none d-lg-block" aria-label="breadcrumb"><ol class="breadcrumb"><li class="breadcrumb-item"><a href="./coding.html">Coding as a Lab</a></li><li class="breadcrumb-item"><a href="./github_intro.html">Coding together</a></li><li class="breadcrumb-item"><a href="./git_conflicts.html">Managing conflicts</a></li></ol></nav>
+<header id="title-block-header" class="quarto-title-block default"><nav class="quarto-page-breadcrumbs quarto-title-breadcrumbs d-none d-lg-block" aria-label="breadcrumb"><ol class="breadcrumb"><li class="breadcrumb-item"><a href="./coding.html">Coding as a Lab</a></li><li class="breadcrumb-item"><a href="./collab_exchange.html">Collaborative strategies</a></li><li class="breadcrumb-item"><a href="./git_conflicts.html">Managing conflicts</a></li></ol></nav>
 <div class="quarto-title">
 <h1 class="title">Managing git merge conflicts</h1>
 </div>
@@ -1032,13 +1032,13 @@ <h3 class="anchored" data-anchor-id="tips-to-reduce-conflicts">Tips to reduce co
 </script>
 <nav class="page-navigation">
   <div class="nav-page nav-page-previous">
-      <a href="./git_cli.html" class="pagination-link" aria-label="Using git at the command line">
-        <i class="bi bi-arrow-left-short"></i> <span class="nav-page-text">Using git at the command line</span>
+      <a href="./02-handson_github_rstudio.html" class="pagination-link" aria-label="Hands-on: Branches using RStudio">
+        <i class="bi bi-arrow-left-short"></i> <span class="nav-page-text">Hands-on: Branches using RStudio</span>
       </a>          
   </div>
   <div class="nav-page nav-page-next">
-      <a href="./git_further_readings.html" class="pagination-link" aria-label="Git and GitHub further readings">
-        <span class="nav-page-text">Git and GitHub further readings</span> <i class="bi bi-arrow-right-short"></i>
+      <a href="./github_template.html" class="pagination-link" aria-label="Repository template">
+        <span class="nav-page-text">Repository template</span> <i class="bi bi-arrow-right-short"></i>
       </a>
   </div>
 </nav>
diff --git a/git_further_readings.html b/git_further_readings.html
index 32f2ad6..9578417 100644
--- a/git_further_readings.html
+++ b/git_further_readings.html
@@ -31,7 +31,7 @@
 <script src="site_libs/quarto-search/quarto-search.js"></script>
 <meta name="quarto:offset" content="./">
 <link href="./collab_exchange.html" rel="next">
-<link href="./git_conflicts.html" rel="prev">
+<link href="./git_cli.html" rel="prev">
 <script src="site_libs/quarto-html/quarto.js"></script>
 <script src="site_libs/quarto-html/popper.min.js"></script>
 <script src="site_libs/quarto-html/tippy.umd.min.js"></script>
@@ -164,12 +164,6 @@
   <a href="./git_cli.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Using git at the command line</span></a>
   </div>
-</li>
-          <li class="sidebar-item">
-  <div class="sidebar-item-container"> 
-  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">Managing conflicts</span></a>
-  </div>
 </li>
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
@@ -203,7 +197,7 @@
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
   <a href="./github_org.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">GitHub Organizations for your Lab</span></a>
+ <span class="menu-text">GitHub Organization for your Lab</span></a>
   </div>
 </li>
           <li class="sidebar-item">
@@ -229,6 +223,12 @@
   <a href="./02-handson_github_rstudio.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Hands-on: Branches using RStudio</span></a>
   </div>
+</li>
+          <li class="sidebar-item">
+  <div class="sidebar-item-container"> 
+  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
+ <span class="menu-text">Managing conflicts</span></a>
+  </div>
 </li>
       </ul>
   </li>
@@ -864,8 +864,8 @@ <h2 class="anchored" data-anchor-id="undoing-things">Undoing things</h2>
 </script>
 <nav class="page-navigation">
   <div class="nav-page nav-page-previous">
-      <a href="./git_conflicts.html" class="pagination-link" aria-label="Managing conflicts">
-        <i class="bi bi-arrow-left-short"></i> <span class="nav-page-text">Managing conflicts</span>
+      <a href="./git_cli.html" class="pagination-link" aria-label="Using git at the command line">
+        <i class="bi bi-arrow-left-short"></i> <span class="nav-page-text">Using git at the command line</span>
       </a>          
   </div>
   <div class="nav-page nav-page-next">
diff --git a/git_rstudio.html b/git_rstudio.html
index 9d37300..e589e1e 100644
--- a/git_rstudio.html
+++ b/git_rstudio.html
@@ -198,12 +198,6 @@
   <a href="./git_cli.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Using git at the command line</span></a>
   </div>
-</li>
-          <li class="sidebar-item">
-  <div class="sidebar-item-container"> 
-  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">Managing conflicts</span></a>
-  </div>
 </li>
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
@@ -237,7 +231,7 @@
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
   <a href="./github_org.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">GitHub Organizations for your Lab</span></a>
+ <span class="menu-text">GitHub Organization for your Lab</span></a>
   </div>
 </li>
           <li class="sidebar-item">
@@ -263,6 +257,12 @@
   <a href="./02-handson_github_rstudio.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Hands-on: Branches using RStudio</span></a>
   </div>
+</li>
+          <li class="sidebar-item">
+  <div class="sidebar-item-container"> 
+  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
+ <span class="menu-text">Managing conflicts</span></a>
+  </div>
 </li>
       </ul>
   </li>
diff --git a/github_intro.html b/github_intro.html
index fd176af..8f7fff1 100644
--- a/github_intro.html
+++ b/github_intro.html
@@ -167,12 +167,6 @@
   <a href="./git_cli.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Using git at the command line</span></a>
   </div>
-</li>
-          <li class="sidebar-item">
-  <div class="sidebar-item-container"> 
-  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">Managing conflicts</span></a>
-  </div>
 </li>
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
@@ -206,7 +200,7 @@
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
   <a href="./github_org.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">GitHub Organizations for your Lab</span></a>
+ <span class="menu-text">GitHub Organization for your Lab</span></a>
   </div>
 </li>
           <li class="sidebar-item">
@@ -232,6 +226,12 @@
   <a href="./02-handson_github_rstudio.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Hands-on: Branches using RStudio</span></a>
   </div>
+</li>
+          <li class="sidebar-item">
+  <div class="sidebar-item-container"> 
+  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
+ <span class="menu-text">Managing conflicts</span></a>
+  </div>
 </li>
       </ul>
   </li>
diff --git a/github_org.html b/github_org.html
index e39593c..13fd0d3 100644
--- a/github_org.html
+++ b/github_org.html
@@ -93,7 +93,7 @@
       <button type="button" class="quarto-btn-toggle btn" data-bs-toggle="collapse" role="button" data-bs-target=".quarto-sidebar-collapse-item" aria-controls="quarto-sidebar" aria-expanded="false" aria-label="Toggle sidebar navigation" onclick="if (window.quartoToggleHeadroom) { window.quartoToggleHeadroom(); }">
         <i class="bi bi-layout-text-sidebar-reverse"></i>
       </button>
-        <nav class="quarto-page-breadcrumbs" aria-label="breadcrumb"><ol class="breadcrumb"><li class="breadcrumb-item"><a href="./coding.html">Coding as a Lab</a></li><li class="breadcrumb-item"><a href="./collab_exchange.html">Collaborative strategies</a></li><li class="breadcrumb-item"><a href="./github_org.html">GitHub Organizations for your Lab</a></li></ol></nav>
+        <nav class="quarto-page-breadcrumbs" aria-label="breadcrumb"><ol class="breadcrumb"><li class="breadcrumb-item"><a href="./coding.html">Coding as a Lab</a></li><li class="breadcrumb-item"><a href="./collab_exchange.html">Collaborative strategies</a></li><li class="breadcrumb-item"><a href="./github_org.html">GitHub Organization for your Lab</a></li></ol></nav>
         <a class="flex-grow-1" role="navigation" data-bs-toggle="collapse" data-bs-target=".quarto-sidebar-collapse-item" aria-controls="quarto-sidebar" aria-expanded="false" aria-label="Toggle sidebar navigation" onclick="if (window.quartoToggleHeadroom) { window.quartoToggleHeadroom(); }">      
         </a>
     </div>
@@ -164,12 +164,6 @@
   <a href="./git_cli.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Using git at the command line</span></a>
   </div>
-</li>
-          <li class="sidebar-item">
-  <div class="sidebar-item-container"> 
-  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">Managing conflicts</span></a>
-  </div>
 </li>
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
@@ -203,7 +197,7 @@
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
   <a href="./github_org.html" class="sidebar-item-text sidebar-link active">
- <span class="menu-text">GitHub Organizations for your Lab</span></a>
+ <span class="menu-text">GitHub Organization for your Lab</span></a>
   </div>
 </li>
           <li class="sidebar-item">
@@ -229,6 +223,12 @@
   <a href="./02-handson_github_rstudio.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Hands-on: Branches using RStudio</span></a>
   </div>
+</li>
+          <li class="sidebar-item">
+  <div class="sidebar-item-container"> 
+  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
+ <span class="menu-text">Managing conflicts</span></a>
+  </div>
 </li>
       </ul>
   </li>
@@ -385,7 +385,7 @@ <h2 id="toc-title">On this page</h2>
 <!-- main -->
 <main class="content" id="quarto-document-content">
 
-<header id="title-block-header" class="quarto-title-block default"><nav class="quarto-page-breadcrumbs quarto-title-breadcrumbs d-none d-lg-block" aria-label="breadcrumb"><ol class="breadcrumb"><li class="breadcrumb-item"><a href="./coding.html">Coding as a Lab</a></li><li class="breadcrumb-item"><a href="./collab_exchange.html">Collaborative strategies</a></li><li class="breadcrumb-item"><a href="./github_org.html">GitHub Organizations for your Lab</a></li></ol></nav>
+<header id="title-block-header" class="quarto-title-block default"><nav class="quarto-page-breadcrumbs quarto-title-breadcrumbs d-none d-lg-block" aria-label="breadcrumb"><ol class="breadcrumb"><li class="breadcrumb-item"><a href="./coding.html">Coding as a Lab</a></li><li class="breadcrumb-item"><a href="./collab_exchange.html">Collaborative strategies</a></li><li class="breadcrumb-item"><a href="./github_org.html">GitHub Organization for your Lab</a></li></ol></nav>
 <div class="quarto-title">
 <h1 class="title">GitHub Organizations</h1>
 </div>
diff --git a/github_teams.html b/github_teams.html
index 43fd93b..300b2bd 100644
--- a/github_teams.html
+++ b/github_teams.html
@@ -164,12 +164,6 @@
   <a href="./git_cli.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Using git at the command line</span></a>
   </div>
-</li>
-          <li class="sidebar-item">
-  <div class="sidebar-item-container"> 
-  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">Managing conflicts</span></a>
-  </div>
 </li>
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
@@ -203,7 +197,7 @@
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
   <a href="./github_org.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">GitHub Organizations for your Lab</span></a>
+ <span class="menu-text">GitHub Organization for your Lab</span></a>
   </div>
 </li>
           <li class="sidebar-item">
@@ -229,6 +223,12 @@
   <a href="./02-handson_github_rstudio.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Hands-on: Branches using RStudio</span></a>
   </div>
+</li>
+          <li class="sidebar-item">
+  <div class="sidebar-item-container"> 
+  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
+ <span class="menu-text">Managing conflicts</span></a>
+  </div>
 </li>
       </ul>
   </li>
@@ -917,8 +917,8 @@ <h2 class="anchored" data-anchor-id="leveraging-teams">Leveraging teams</h2>
 </script>
 <nav class="page-navigation">
   <div class="nav-page nav-page-previous">
-      <a href="./github_org.html" class="pagination-link" aria-label="GitHub Organizations for your Lab">
-        <i class="bi bi-arrow-left-short"></i> <span class="nav-page-text">GitHub Organizations for your Lab</span>
+      <a href="./github_org.html" class="pagination-link" aria-label="GitHub Organization for your Lab">
+        <i class="bi bi-arrow-left-short"></i> <span class="nav-page-text">GitHub Organization for your Lab</span>
       </a>          
   </div>
   <div class="nav-page nav-page-next">
diff --git a/github_template.html b/github_template.html
index 5f5441a..85f60ec 100644
--- a/github_template.html
+++ b/github_template.html
@@ -31,7 +31,7 @@
 <script src="site_libs/quarto-search/quarto-search.js"></script>
 <meta name="quarto:offset" content="./">
 <link href="./data_mgmt.html" rel="next">
-<link href="./02-handson_github_rstudio.html" rel="prev">
+<link href="./git_conflicts.html" rel="prev">
 <script src="site_libs/quarto-html/quarto.js"></script>
 <script src="site_libs/quarto-html/popper.min.js"></script>
 <script src="site_libs/quarto-html/tippy.umd.min.js"></script>
@@ -164,12 +164,6 @@
   <a href="./git_cli.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Using git at the command line</span></a>
   </div>
-</li>
-          <li class="sidebar-item">
-  <div class="sidebar-item-container"> 
-  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">Managing conflicts</span></a>
-  </div>
 </li>
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
@@ -203,7 +197,7 @@
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
   <a href="./github_org.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">GitHub Organizations for your Lab</span></a>
+ <span class="menu-text">GitHub Organization for your Lab</span></a>
   </div>
 </li>
           <li class="sidebar-item">
@@ -229,6 +223,12 @@
   <a href="./02-handson_github_rstudio.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Hands-on: Branches using RStudio</span></a>
   </div>
+</li>
+          <li class="sidebar-item">
+  <div class="sidebar-item-container"> 
+  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
+ <span class="menu-text">Managing conflicts</span></a>
+  </div>
 </li>
       </ul>
   </li>
@@ -858,8 +858,8 @@ <h2 class="anchored" data-anchor-id="repository-templates">Repository templates<
 </script>
 <nav class="page-navigation">
   <div class="nav-page nav-page-previous">
-      <a href="./02-handson_github_rstudio.html" class="pagination-link" aria-label="Hands-on: Branches using RStudio">
-        <i class="bi bi-arrow-left-short"></i> <span class="nav-page-text">Hands-on: Branches using RStudio</span>
+      <a href="./git_conflicts.html" class="pagination-link" aria-label="Managing conflicts">
+        <i class="bi bi-arrow-left-short"></i> <span class="nav-page-text">Managing conflicts</span>
       </a>          
   </div>
   <div class="nav-page nav-page-next">
diff --git a/github_workflows.html b/github_workflows.html
index a13a64e..727b362 100644
--- a/github_workflows.html
+++ b/github_workflows.html
@@ -164,12 +164,6 @@
   <a href="./git_cli.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Using git at the command line</span></a>
   </div>
-</li>
-          <li class="sidebar-item">
-  <div class="sidebar-item-container"> 
-  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">Managing conflicts</span></a>
-  </div>
 </li>
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
@@ -203,7 +197,7 @@
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
   <a href="./github_org.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">GitHub Organizations for your Lab</span></a>
+ <span class="menu-text">GitHub Organization for your Lab</span></a>
   </div>
 </li>
           <li class="sidebar-item">
@@ -229,6 +223,12 @@
   <a href="./02-handson_github_rstudio.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Hands-on: Branches using RStudio</span></a>
   </div>
+</li>
+          <li class="sidebar-item">
+  <div class="sidebar-item-container"> 
+  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
+ <span class="menu-text">Managing conflicts</span></a>
+  </div>
 </li>
       </ul>
   </li>
diff --git a/index.html b/index.html
index 3bbb208..bbdcee2 100644
--- a/index.html
+++ b/index.html
@@ -167,12 +167,6 @@
   <a href="./git_cli.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Using git at the command line</span></a>
   </div>
-</li>
-          <li class="sidebar-item">
-  <div class="sidebar-item-container"> 
-  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">Managing conflicts</span></a>
-  </div>
 </li>
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
@@ -206,7 +200,7 @@
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
   <a href="./github_org.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">GitHub Organizations for your Lab</span></a>
+ <span class="menu-text">GitHub Organization for your Lab</span></a>
   </div>
 </li>
           <li class="sidebar-item">
@@ -232,6 +226,12 @@
   <a href="./02-handson_github_rstudio.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Hands-on: Branches using RStudio</span></a>
   </div>
+</li>
+          <li class="sidebar-item">
+  <div class="sidebar-item-container"> 
+  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
+ <span class="menu-text">Managing conflicts</span></a>
+  </div>
 </li>
       </ul>
   </li>
diff --git a/intro_cli.html b/intro_cli.html
index eed9769..8d92e6d 100644
--- a/intro_cli.html
+++ b/intro_cli.html
@@ -198,12 +198,6 @@
   <a href="./git_cli.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Using git at the command line</span></a>
   </div>
-</li>
-          <li class="sidebar-item">
-  <div class="sidebar-item-container"> 
-  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">Managing conflicts</span></a>
-  </div>
 </li>
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
@@ -237,7 +231,7 @@
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
   <a href="./github_org.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">GitHub Organizations for your Lab</span></a>
+ <span class="menu-text">GitHub Organization for your Lab</span></a>
   </div>
 </li>
           <li class="sidebar-item">
@@ -263,6 +257,12 @@
   <a href="./02-handson_github_rstudio.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Hands-on: Branches using RStudio</span></a>
   </div>
+</li>
+          <li class="sidebar-item">
+  <div class="sidebar-item-container"> 
+  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
+ <span class="menu-text">Managing conflicts</span></a>
+  </div>
 </li>
       </ul>
   </li>
diff --git a/preserve_code.html b/preserve_code.html
index c84afee..331f190 100644
--- a/preserve_code.html
+++ b/preserve_code.html
@@ -198,12 +198,6 @@
   <a href="./git_cli.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Using git at the command line</span></a>
   </div>
-</li>
-          <li class="sidebar-item">
-  <div class="sidebar-item-container"> 
-  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">Managing conflicts</span></a>
-  </div>
 </li>
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
@@ -237,7 +231,7 @@
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
   <a href="./github_org.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">GitHub Organizations for your Lab</span></a>
+ <span class="menu-text">GitHub Organization for your Lab</span></a>
   </div>
 </li>
           <li class="sidebar-item">
@@ -263,6 +257,12 @@
   <a href="./02-handson_github_rstudio.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Hands-on: Branches using RStudio</span></a>
   </div>
+</li>
+          <li class="sidebar-item">
+  <div class="sidebar-item-container"> 
+  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
+ <span class="menu-text">Managing conflicts</span></a>
+  </div>
 </li>
       </ul>
   </li>
diff --git a/preserve_computing-env.html b/preserve_computing-env.html
index f83b08f..338f286 100644
--- a/preserve_computing-env.html
+++ b/preserve_computing-env.html
@@ -198,12 +198,6 @@
   <a href="./git_cli.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Using git at the command line</span></a>
   </div>
-</li>
-          <li class="sidebar-item">
-  <div class="sidebar-item-container"> 
-  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">Managing conflicts</span></a>
-  </div>
 </li>
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
@@ -237,7 +231,7 @@
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
   <a href="./github_org.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">GitHub Organizations for your Lab</span></a>
+ <span class="menu-text">GitHub Organization for your Lab</span></a>
   </div>
 </li>
           <li class="sidebar-item">
@@ -263,6 +257,12 @@
   <a href="./02-handson_github_rstudio.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Hands-on: Branches using RStudio</span></a>
   </div>
+</li>
+          <li class="sidebar-item">
+  <div class="sidebar-item-container"> 
+  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
+ <span class="menu-text">Managing conflicts</span></a>
+  </div>
 </li>
       </ul>
   </li>
diff --git a/preserve_data-fair.html b/preserve_data-fair.html
index eacc969..a9feb60 100644
--- a/preserve_data-fair.html
+++ b/preserve_data-fair.html
@@ -164,12 +164,6 @@
   <a href="./git_cli.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Using git at the command line</span></a>
   </div>
-</li>
-          <li class="sidebar-item">
-  <div class="sidebar-item-container"> 
-  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">Managing conflicts</span></a>
-  </div>
 </li>
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
@@ -203,7 +197,7 @@
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
   <a href="./github_org.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">GitHub Organizations for your Lab</span></a>
+ <span class="menu-text">GitHub Organization for your Lab</span></a>
   </div>
 </li>
           <li class="sidebar-item">
@@ -229,6 +223,12 @@
   <a href="./02-handson_github_rstudio.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Hands-on: Branches using RStudio</span></a>
   </div>
+</li>
+          <li class="sidebar-item">
+  <div class="sidebar-item-container"> 
+  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
+ <span class="menu-text">Managing conflicts</span></a>
+  </div>
 </li>
       </ul>
   </li>
diff --git a/preserve_data.html b/preserve_data.html
index 5507587..ed368b2 100644
--- a/preserve_data.html
+++ b/preserve_data.html
@@ -164,12 +164,6 @@
   <a href="./git_cli.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Using git at the command line</span></a>
   </div>
-</li>
-          <li class="sidebar-item">
-  <div class="sidebar-item-container"> 
-  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">Managing conflicts</span></a>
-  </div>
 </li>
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
@@ -203,7 +197,7 @@
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
   <a href="./github_org.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">GitHub Organizations for your Lab</span></a>
+ <span class="menu-text">GitHub Organization for your Lab</span></a>
   </div>
 </li>
           <li class="sidebar-item">
@@ -229,6 +223,12 @@
   <a href="./02-handson_github_rstudio.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Hands-on: Branches using RStudio</span></a>
   </div>
+</li>
+          <li class="sidebar-item">
+  <div class="sidebar-item-container"> 
+  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
+ <span class="menu-text">Managing conflicts</span></a>
+  </div>
 </li>
       </ul>
   </li>
diff --git a/preserve_license.html b/preserve_license.html
index 50fb083..aeab77f 100644
--- a/preserve_license.html
+++ b/preserve_license.html
@@ -164,12 +164,6 @@
   <a href="./git_cli.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Using git at the command line</span></a>
   </div>
-</li>
-          <li class="sidebar-item">
-  <div class="sidebar-item-container"> 
-  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">Managing conflicts</span></a>
-  </div>
 </li>
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
@@ -203,7 +197,7 @@
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
   <a href="./github_org.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">GitHub Organizations for your Lab</span></a>
+ <span class="menu-text">GitHub Organization for your Lab</span></a>
   </div>
 </li>
           <li class="sidebar-item">
@@ -229,6 +223,12 @@
   <a href="./02-handson_github_rstudio.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Hands-on: Branches using RStudio</span></a>
   </div>
+</li>
+          <li class="sidebar-item">
+  <div class="sidebar-item-container"> 
+  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
+ <span class="menu-text">Managing conflicts</span></a>
+  </div>
 </li>
       </ul>
   </li>
diff --git a/preserve_prompts.html b/preserve_prompts.html
index 88bf693..9c80bf4 100644
--- a/preserve_prompts.html
+++ b/preserve_prompts.html
@@ -164,12 +164,6 @@
   <a href="./git_cli.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Using git at the command line</span></a>
   </div>
-</li>
-          <li class="sidebar-item">
-  <div class="sidebar-item-container"> 
-  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">Managing conflicts</span></a>
-  </div>
 </li>
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
@@ -203,7 +197,7 @@
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
   <a href="./github_org.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">GitHub Organizations for your Lab</span></a>
+ <span class="menu-text">GitHub Organization for your Lab</span></a>
   </div>
 </li>
           <li class="sidebar-item">
@@ -229,6 +223,12 @@
   <a href="./02-handson_github_rstudio.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Hands-on: Branches using RStudio</span></a>
   </div>
+</li>
+          <li class="sidebar-item">
+  <div class="sidebar-item-container"> 
+  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
+ <span class="menu-text">Managing conflicts</span></a>
+  </div>
 </li>
       </ul>
   </li>
diff --git a/preserve_readme.html b/preserve_readme.html
index 60aabb9..edcfc87 100644
--- a/preserve_readme.html
+++ b/preserve_readme.html
@@ -164,12 +164,6 @@
   <a href="./git_cli.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Using git at the command line</span></a>
   </div>
-</li>
-          <li class="sidebar-item">
-  <div class="sidebar-item-container"> 
-  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">Managing conflicts</span></a>
-  </div>
 </li>
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
@@ -203,7 +197,7 @@
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
   <a href="./github_org.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">GitHub Organizations for your Lab</span></a>
+ <span class="menu-text">GitHub Organization for your Lab</span></a>
   </div>
 </li>
           <li class="sidebar-item">
@@ -229,6 +223,12 @@
   <a href="./02-handson_github_rstudio.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Hands-on: Branches using RStudio</span></a>
   </div>
+</li>
+          <li class="sidebar-item">
+  <div class="sidebar-item-container"> 
+  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
+ <span class="menu-text">Managing conflicts</span></a>
+  </div>
 </li>
       </ul>
   </li>
diff --git a/preserve_self.html b/preserve_self.html
index 39aa2c2..b17c10a 100644
--- a/preserve_self.html
+++ b/preserve_self.html
@@ -164,12 +164,6 @@
   <a href="./git_cli.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Using git at the command line</span></a>
   </div>
-</li>
-          <li class="sidebar-item">
-  <div class="sidebar-item-container"> 
-  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">Managing conflicts</span></a>
-  </div>
 </li>
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
@@ -203,7 +197,7 @@
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
   <a href="./github_org.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">GitHub Organizations for your Lab</span></a>
+ <span class="menu-text">GitHub Organization for your Lab</span></a>
   </div>
 </li>
           <li class="sidebar-item">
@@ -229,6 +223,12 @@
   <a href="./02-handson_github_rstudio.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Hands-on: Branches using RStudio</span></a>
   </div>
+</li>
+          <li class="sidebar-item">
+  <div class="sidebar-item-container"> 
+  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
+ <span class="menu-text">Managing conflicts</span></a>
+  </div>
 </li>
       </ul>
   </li>
diff --git a/search.json b/search.json
index 9a14669..60c1f8a 100644
--- a/search.json
+++ b/search.json
@@ -1025,7 +1025,7 @@
     "crumbs": [
       "Coding as a Lab",
       "Collaborative strategies",
-      "GitHub Organizations for your Lab"
+      "GitHub Organization for your Lab"
     ]
   },
   {
@@ -1037,7 +1037,7 @@
     "crumbs": [
       "Coding as a Lab",
       "Collaborative strategies",
-      "GitHub Organizations for your Lab"
+      "GitHub Organization for your Lab"
     ]
   },
   {
@@ -1049,7 +1049,7 @@
     "crumbs": [
       "Coding as a Lab",
       "Collaborative strategies",
-      "GitHub Organizations for your Lab"
+      "GitHub Organization for your Lab"
     ]
   },
   {
@@ -1061,7 +1061,7 @@
     "crumbs": [
       "Coding as a Lab",
       "Collaborative strategies",
-      "GitHub Organizations for your Lab"
+      "GitHub Organization for your Lab"
     ]
   },
   {
@@ -1164,7 +1164,7 @@
     "text": "You did nothing wrong!! Git is simply asking for your help to merge files because it can not figure it out on its own.\n\n\n\n\n\n\nOne thing to note before we continue\n\n\n\ngit pull = git fetch (getting things from GitHub) + git merge (merging the versions between your local and GitHub)\n\n\nA conflict arises when git can not automatically merge two versions of a file. When the changes are on different files or on the same file but far apart, git will figure it out on his own and do the merge automatically. However, if changes are overlapping, git will call you to the rescue because it is not sure which version should be kept. When you are in this situation, you are “stalled” between the git fetch & the git merge and you need to edit the file(s) where there is a conflict. Luckily, git will flag the lines that have different versions for you to look at.",
     "crumbs": [
       "Coding as a Lab",
-      "Coding together",
+      "Collaborative strategies",
       "Managing conflicts"
     ]
   },
@@ -1176,7 +1176,7 @@
     "text": "How to minimize the risk of conflicts?\n\nCommunicate!! Who is working on what script/file today? GitHub issues and tagging people is a great way to do this\ncommit, pull, and push often , so the changes between versions are kept minimal\n\nThese two tips should help you on your git conflict free journey!!\nIf conflicts keep happening in your collaboration, using git branches might be the next step to consider for your team.",
     "crumbs": [
       "Coding as a Lab",
-      "Coding together",
+      "Collaborative strategies",
       "Managing conflicts"
     ]
   },
@@ -1188,7 +1188,7 @@
     "text": "Example using RStudio\nOk, let’s create a conflict with our favorite desserts repository.\nUser 1 is going to change a line on the README an push the change to GitHub.\n\n\n\n\n\nNow user 2, is going to also make an edit to the README on this same line while forgetting to pull before starting to edit the file\nIn this example, we will be changing the favorite dessert of the same person:\n\n\n\n\n\nSave and commit your changes.\nNow it is time to pull and push your changes… however git is unsure how to reconcile the two versions of the README.md\n\n\n\n\n\n\n\n\n\n\n\nNote\n\n\n\nBefore this you might first have the pop-up below on your screen that prompts you to tell git what techniques it should use to resolve conflicts\n\n\n\n\n\nWe recommend to choose the merge option by copy-pasting this line in the terminal:\ngit config pull.rebase false\n\n\nNote the tags that git has automatically inserted in the text to highlight: 1. where is the conflict and 2. what are the two versions you are trying to reconcile. Note also that RStudio is flagging the file with an orange U logo to let you know that the files are Unmerged.\n\n\n\n\n\nYou can edit the README to resolve the conflict to your liking. You could opt to choose one of the version\n\n\n\n\n\nor to come up with a “blended” version:\n\n\n\n\n\nOnce you are satisfied with your version, you can save the file and commit your changes\n\n\n\n\n\nDon’t forget to pull and push to synchronize your local changes with GitHub.\nIf you now look at the history, you can see how git has tracked the conflict resolution. We will talk about branches later on, but spoiler alert it looks very much how you would merge a branch back to the main branch.\n\n\n\n\n\n\nTips to reduce conflicts\n\nAlways start your working sessions with a pull and Commit often in small chunks\nThis can be often avoided by good communication about who is working on various sections of each file, and trying to avoid overlaps. But sometimes it happens, and git is there to warn you about potential problems. And git will not allow you to overwrite one person’s changes to a file with another’s changes to the same file if they were based on the same version.\nEncapsulate your work using branches and forks. This allows you to work on your modifications without interfering with your collaborator’s work until you decide it is time to merge your changes via a Pull Request. Note this can still create conflicts between versions but at least you are in control of when it will happen and the Pull Request is a great opportunity to discuss conflicts with your collaborators.",
     "crumbs": [
       "Coding as a Lab",
-      "Coding together",
+      "Collaborative strategies",
       "Managing conflicts"
     ]
   },
diff --git a/sitemap.xml b/sitemap.xml
index 348c537..05be24e 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -2,122 +2,122 @@
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
   <url>
     <loc>https://UCSB-Library-Research-Data-Services.github.io/reproducible-lab/data_mgmt.html</loc>
-    <lastmod>2024-11-27T19:58:02.707Z</lastmod>
+    <lastmod>2024-11-27T20:01:12.268Z</lastmod>
   </url>
   <url>
     <loc>https://UCSB-Library-Research-Data-Services.github.io/reproducible-lab/github_intro.html</loc>
-    <lastmod>2024-11-27T19:58:02.707Z</lastmod>
+    <lastmod>2024-11-27T20:01:12.268Z</lastmod>
   </url>
   <url>
     <loc>https://UCSB-Library-Research-Data-Services.github.io/reproducible-lab/index.html</loc>
-    <lastmod>2024-11-27T19:58:02.831Z</lastmod>
+    <lastmod>2024-11-27T20:01:12.396Z</lastmod>
   </url>
   <url>
     <loc>https://UCSB-Library-Research-Data-Services.github.io/reproducible-lab/collab_pairprog.html</loc>
-    <lastmod>2024-11-27T19:58:02.707Z</lastmod>
+    <lastmod>2024-11-27T20:01:12.268Z</lastmod>
   </url>
   <url>
     <loc>https://UCSB-Library-Research-Data-Services.github.io/reproducible-lab/git_cli.html</loc>
-    <lastmod>2024-11-27T19:58:02.707Z</lastmod>
+    <lastmod>2024-11-27T20:01:12.268Z</lastmod>
   </url>
   <url>
     <loc>https://UCSB-Library-Research-Data-Services.github.io/reproducible-lab/git_further_readings.html</loc>
-    <lastmod>2024-11-27T19:58:02.707Z</lastmod>
+    <lastmod>2024-11-27T20:01:12.268Z</lastmod>
   </url>
   <url>
     <loc>https://UCSB-Library-Research-Data-Services.github.io/reproducible-lab/preserve_self.html</loc>
-    <lastmod>2024-11-27T19:58:02.831Z</lastmod>
+    <lastmod>2024-11-27T20:01:12.396Z</lastmod>
   </url>
   <url>
     <loc>https://UCSB-Library-Research-Data-Services.github.io/reproducible-lab/03-handson_github_workflows.html</loc>
-    <lastmod>2024-11-27T19:58:02.703Z</lastmod>
+    <lastmod>2024-11-27T20:01:12.268Z</lastmod>
   </url>
   <url>
     <loc>https://UCSB-Library-Research-Data-Services.github.io/reproducible-lab/coding.html</loc>
-    <lastmod>2024-11-27T19:58:02.703Z</lastmod>
+    <lastmod>2024-11-27T20:01:12.268Z</lastmod>
   </url>
   <url>
     <loc>https://UCSB-Library-Research-Data-Services.github.io/reproducible-lab/preserve_license.html</loc>
-    <lastmod>2024-11-27T19:58:02.831Z</lastmod>
+    <lastmod>2024-11-27T20:01:12.396Z</lastmod>
   </url>
   <url>
     <loc>https://UCSB-Library-Research-Data-Services.github.io/reproducible-lab/preserve_data.html</loc>
-    <lastmod>2024-11-27T19:58:02.831Z</lastmod>
+    <lastmod>2024-11-27T20:01:12.396Z</lastmod>
   </url>
   <url>
     <loc>https://UCSB-Library-Research-Data-Services.github.io/reproducible-lab/git_rstudio.html</loc>
-    <lastmod>2024-11-27T19:58:02.707Z</lastmod>
+    <lastmod>2024-11-27T20:01:12.268Z</lastmod>
   </url>
   <url>
     <loc>https://UCSB-Library-Research-Data-Services.github.io/reproducible-lab/about.html</loc>
-    <lastmod>2024-11-27T19:58:02.703Z</lastmod>
+    <lastmod>2024-11-27T20:01:12.268Z</lastmod>
   </url>
   <url>
     <loc>https://UCSB-Library-Research-Data-Services.github.io/reproducible-lab/datamgmt_plan.html</loc>
-    <lastmod>2024-11-27T19:58:02.707Z</lastmod>
+    <lastmod>2024-11-27T20:01:12.268Z</lastmod>
   </url>
   <url>
     <loc>https://UCSB-Library-Research-Data-Services.github.io/reproducible-lab/01-handson_github_website.html</loc>
-    <lastmod>2024-11-27T19:58:02.703Z</lastmod>
+    <lastmod>2024-11-27T20:01:12.268Z</lastmod>
   </url>
   <url>
     <loc>https://UCSB-Library-Research-Data-Services.github.io/reproducible-lab/collab_exchange.html</loc>
-    <lastmod>2024-11-27T19:58:02.703Z</lastmod>
+    <lastmod>2024-11-27T20:01:12.268Z</lastmod>
   </url>
   <url>
     <loc>https://UCSB-Library-Research-Data-Services.github.io/reproducible-lab/github_template.html</loc>
-    <lastmod>2024-11-27T19:58:02.707Z</lastmod>
+    <lastmod>2024-11-27T20:01:12.268Z</lastmod>
   </url>
   <url>
     <loc>https://UCSB-Library-Research-Data-Services.github.io/reproducible-lab/preserve_readme.html</loc>
-    <lastmod>2024-11-27T19:58:02.831Z</lastmod>
+    <lastmod>2024-11-27T20:01:12.396Z</lastmod>
   </url>
   <url>
     <loc>https://UCSB-Library-Research-Data-Services.github.io/reproducible-lab/02-handson_github_rstudio.html</loc>
-    <lastmod>2024-11-27T19:58:02.703Z</lastmod>
+    <lastmod>2024-11-27T20:01:12.268Z</lastmod>
   </url>
   <url>
     <loc>https://UCSB-Library-Research-Data-Services.github.io/reproducible-lab/datamgmt_manage.html</loc>
-    <lastmod>2024-11-27T19:58:02.707Z</lastmod>
+    <lastmod>2024-11-27T20:01:12.268Z</lastmod>
   </url>
   <url>
     <loc>https://UCSB-Library-Research-Data-Services.github.io/reproducible-lab/intro_cli.html</loc>
-    <lastmod>2024-11-27T19:58:02.831Z</lastmod>
+    <lastmod>2024-11-27T20:01:12.396Z</lastmod>
   </url>
   <url>
     <loc>https://UCSB-Library-Research-Data-Services.github.io/reproducible-lab/preserve_computing-env.html</loc>
-    <lastmod>2024-11-27T19:58:02.831Z</lastmod>
+    <lastmod>2024-11-27T20:01:12.396Z</lastmod>
   </url>
   <url>
     <loc>https://UCSB-Library-Research-Data-Services.github.io/reproducible-lab/preserve_prompts.html</loc>
-    <lastmod>2024-11-27T19:58:02.831Z</lastmod>
+    <lastmod>2024-11-27T20:01:12.396Z</lastmod>
   </url>
   <url>
     <loc>https://UCSB-Library-Research-Data-Services.github.io/reproducible-lab/preserve_code.html</loc>
-    <lastmod>2024-11-27T19:58:02.831Z</lastmod>
+    <lastmod>2024-11-27T20:01:12.396Z</lastmod>
   </url>
   <url>
     <loc>https://UCSB-Library-Research-Data-Services.github.io/reproducible-lab/github_workflows.html</loc>
-    <lastmod>2024-11-27T19:58:02.707Z</lastmod>
+    <lastmod>2024-11-27T20:01:12.268Z</lastmod>
   </url>
   <url>
     <loc>https://UCSB-Library-Research-Data-Services.github.io/reproducible-lab/github_org.html</loc>
-    <lastmod>2024-11-27T19:58:02.707Z</lastmod>
+    <lastmod>2024-11-27T20:01:12.268Z</lastmod>
   </url>
   <url>
     <loc>https://UCSB-Library-Research-Data-Services.github.io/reproducible-lab/github_teams.html</loc>
-    <lastmod>2024-11-27T19:58:02.707Z</lastmod>
+    <lastmod>2024-11-27T20:01:12.268Z</lastmod>
   </url>
   <url>
     <loc>https://UCSB-Library-Research-Data-Services.github.io/reproducible-lab/preserve_data-fair.html</loc>
-    <lastmod>2024-11-27T19:58:02.831Z</lastmod>
+    <lastmod>2024-11-27T20:01:12.396Z</lastmod>
   </url>
   <url>
     <loc>https://UCSB-Library-Research-Data-Services.github.io/reproducible-lab/git_conflicts.html</loc>
-    <lastmod>2024-11-27T19:58:02.707Z</lastmod>
+    <lastmod>2024-11-27T20:01:12.268Z</lastmod>
   </url>
   <url>
     <loc>https://UCSB-Library-Research-Data-Services.github.io/reproducible-lab/datamgmt_prompts.html</loc>
-    <lastmod>2024-11-27T19:58:02.707Z</lastmod>
+    <lastmod>2024-11-27T20:01:12.268Z</lastmod>
   </url>
 </urlset>