diff --git a/.github/workflows/static_pages.yml b/.github/workflows/static_pages.yml
index 608c092..c58b0dc 100644
--- a/.github/workflows/static_pages.yml
+++ b/.github/workflows/static_pages.yml
@@ -112,8 +112,13 @@ jobs:
         run: |
           pygmentize -f html -l lua -O noclasses,style=monokai classes/api/SpearheadApiDoc.lua > _docs/pages/temp_api_code.html
           # Insert the highlighted code into the placeholder in spearheadapi.html
+<<<<<<< HEAD
+          sed -i '/@@API_CODE@@/r _docs/pages/temp_api_code.html' _docs/pages/spearheadapi.html
+          sed -i '/@@API_CODE@@/d' _docs/pages/spearheadapi.html
+=======
           sed -i "/#\{API_CODE\}#/r _docs/pages/temp_api_code.html" _docs/pages/spearheadapi.html
           sed -i "/#\{API_CODE\}#/d" _docs/pages/spearheadapi.html
+>>>>>>> b0dd6b62c6d71280e746bb4a895fc1e6ec83c549
           rm _docs/pages/temp_api_code.html
 
       - name: Setup Pages
diff --git a/_docs/pages/spearheadapi.html b/_docs/pages/spearheadapi.html
index a2a0a06..348e163 100644
--- a/_docs/pages/spearheadapi.html
+++ b/_docs/pages/spearheadapi.html
@@ -66,7 +66,11 @@
 
                 <h2 id="stages">Stages</h2>
                 <pre>
+<<<<<<< HEAD
+                    @@API_CODE@@
+=======
                     #{API_CODE}#
+>>>>>>> b0dd6b62c6d71280e746bb4a895fc1e6ec83c549
                 </pre>
             </div>
         </div>