diff --git a/handbook/garlictarp.html b/handbook/garlictarp.html
index 3fa3fb950..e2f3acb1b 100644
--- a/handbook/garlictarp.html
+++ b/handbook/garlictarp.html
@@ -46,8 +46,4 @@
 <h2 id=tarp2> Tarp 2</h2>
 
 </body>
-<<<<<<< HEAD
-</html></body></html>
-=======
 </html>
->>>>>>> 7a9b844f (added garlic camp rigging topo: garlictarp.html)