diff --git a/.github/workflows/images_build.yml b/.github/workflows/images_build.yml
index d40dc5893..fed3d41d1 100644
--- a/.github/workflows/images_build.yml
+++ b/.github/workflows/images_build.yml
@@ -12,12 +12,8 @@ on:
       - 'trunk'
     paths:
       - 'Dockerfiles/**'
-<<<<<<< HEAD
       - '!**/README.md'
       - '!Dockerfiles/*/rhel/*'
-=======
-      - '!Dockerfiles/*/rhel/**'
->>>>>>> f6ec3dbb5e7ef76c4568ad27621adfb907330bee
       - '!Dockerfiles/*/windows/*'
       - '.github/workflows/images_build.yml'