diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4c85fbf..8688376 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,7 +12,6 @@ jobs:
     name: Frontend Lint
     runs-on: ubuntu-latest
     steps:
-<<<<<<< HEAD
       - uses: actions/checkout@v5
       - uses: actions/setup-node@v6
         with:
@@ -30,7 +29,6 @@ jobs:
     name: Frontend Type Check
     runs-on: ubuntu-latest
     steps:
-<<<<<<< HEAD
       - uses: actions/checkout@v5
       - uses: actions/setup-node@v6
         with:
@@ -48,7 +46,6 @@ jobs:
     name: Frontend Build
     runs-on: ubuntu-latest
     steps:
-<<<<<<< HEAD
       - uses: actions/checkout@v5
       - uses: actions/setup-node@v6
         with:
@@ -71,7 +68,6 @@ jobs:
     name: Frontend E2E Tests
     runs-on: ubuntu-latest
     steps:
-<<<<<<< HEAD
       - uses: actions/checkout@v5
       - uses: actions/setup-node@v6
         with:
@@ -99,7 +95,6 @@ jobs:
     name: Orchestrator Build
     runs-on: ubuntu-latest
     steps:
-<<<<<<< HEAD
       - uses: actions/checkout@v5
       - uses: actions/setup-node@v6
         with:
@@ -118,7 +113,6 @@ jobs:
     name: Contracts Compile
     runs-on: ubuntu-latest
     steps:
-<<<<<<< HEAD
       - uses: actions/checkout@v5
       - uses: actions/setup-node@v6
         with:
@@ -136,7 +130,6 @@ jobs:
     name: Contracts Test
     runs-on: ubuntu-latest
     steps:
-<<<<<<< HEAD
       - uses: actions/checkout@v5
       - uses: actions/setup-node@v6
         with: