diff --git a/handbook/garlictarp.html b/handbook/garlictarp.html
index ea55dbfd9..cea9821ee 100644
--- a/handbook/garlictarp.html
+++ b/handbook/garlictarp.html
@@ -1,4 +1,7 @@
+<<<<<<< HEAD
 <html><head><title>Gal;</title></head><body>
+=======
+>>>>>>> 7a9b844f (added garlic camp rigging topo: garlictarp.html)
 <!DOCTYPE html>
 <html>
 <head>
@@ -12,7 +15,11 @@
 
 <p>New for 2023, Garlic Cave Camp is "practical" (Ben Chaddock, 2023).</p>
 
+<<<<<<< HEAD
 <p>This guide was written by Joe Stell in 2023 (week 5) with much help from Jono Lester, and as Garlic Camp is still very much a work in progress, feel free to experiment with tarp setups and update this guide should you find an improvement - make sure to credit yourself!</p>
+=======
+<p>This guide was written by Joe Stell in 2023 (week 5) with help from Nadia Raeburn-Cherradi and Jono Lester - as Garlic Camp is still very much a work in progress, feel free to experiment with tarp setups and update this guide should you find an improvement - make sure to credit yourself!</p>
+>>>>>>> 7a9b844f (added garlic camp rigging topo: garlictarp.html)
 
 <h2>Directions, Terminology and Pre-amble</h2>
 
@@ -47,4 +54,8 @@
 <h2 id=tarp2> Tarp 2</h2>
 
 </body>
+<<<<<<< HEAD
 </html></body></html>
+=======
+</html>
+>>>>>>> 7a9b844f (added garlic camp rigging topo: garlictarp.html)
