diff --git a/_docs/pages/spearheadapi.html b/_docs/pages/spearheadapi.html
index 348e163..eff1e33 100644
--- a/_docs/pages/spearheadapi.html
+++ b/_docs/pages/spearheadapi.html
@@ -66,11 +66,7 @@
 
                 <h2 id="stages">Stages</h2>
                 <pre>
-<<<<<<< HEAD
                     @@API_CODE@@
-=======
-                    #{API_CODE}#
->>>>>>> b0dd6b62c6d71280e746bb4a895fc1e6ec83c549
                 </pre>
             </div>
         </div>