diff --git a/.circleci/cci-agent-setup.yml b/.circleci/cci-agent-setup.yml
index d528b5770..bae9e3c12 100644
--- a/.circleci/cci-agent-setup.yml
+++ b/.circleci/cci-agent-setup.yml
@@ -1,19 +1,3 @@
-<<<<<<< HEAD
-version: '2.1'
-
-jobs:
-    test:
-        docker:
-            - image: cimg/node:24.0-browsers
-        steps:
-            - checkout
-            - run: echo "Running example step, please edit this file"
-
-workflows:
-    main:
-        jobs:
-            - test
-=======
 version: "2.1"
 
 jobs:
@@ -25,13 +9,6 @@ jobs:
             - run: echo "Running example step, please edit this file"
 
 workflows:
-<<<<<<< HEAD
-  main:
-    jobs:
-      - test
->>>>>>> 64b754cfe (fix(ci): populate cci-agent-setup.yml to fix "root is not an object" error)
-=======
     main:
         jobs:
             - test
->>>>>>> 879e75bcf (style: apply automated autofixes (ruff / prettier / clang-format) [CodeQL Advanced])
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8b79a43bf..4635596b3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -94,11 +94,7 @@ jobs:
     executor: python311
     parallelism: 2
     steps:
-<<<<<<< HEAD
-            - checkout
-            - run: echo "Running example step, please edit this file"
 version: "2.1"
-=======
       - checkout
       - restore-pip-cache
       - install-dev-deps
@@ -149,4 +145,3 @@ workflows:
             - lint
             - unit-test
             - pre-commit
->>>>>>> 625f1806b (ci: optimize CircleCI config with Python image, caching, and parallel jobs)