diff --git a/.gitea/workflows/demo.yaml b/.gitea/workflows/demo.yaml
index a55c37e..f8d91d8 100644
--- a/.gitea/workflows/demo.yaml
+++ b/.gitea/workflows/demo.yaml
@@ -14,9 +14,5 @@ jobs:
       - name: Install dependencies  
         run: yarn 
       - name: Build Docusaurus website  
-<<<<<<< HEAD
-        run: yarn build 
-=======
         run: yarn build 
        
->>>>>>> c32da84657143bfd0ec61c55ec41046b9b5ccd42