diff --git a/.github/workflows/local_example.yml b/.github/workflows/local_example.yml
index cd9fe284c72..78514e3b9ce 100644
--- a/.github/workflows/local_example.yml
+++ b/.github/workflows/local_example.yml
@@ -8,12 +8,8 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-<<<<<<< HEAD
         os: [ubuntu-22.04]
-        topo: [consul,etcd,k8s]
-=======
         topo: [consul,etcd,zk2]
->>>>>>> 1a9119d089 (examples: fix flag syntax for zkctl (#14469))
 
     steps:
     - name: Skip CI