diff --git a/.github/workflows/build-docker-image.yml b/.github/workflows/build-docker-image.yml
index d58bf7ad0..3dd64c930 100644
--- a/.github/workflows/build-docker-image.yml
+++ b/.github/workflows/build-docker-image.yml
@@ -47,8 +47,6 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
-=======
->>>>>>> upstream/main
       - name: Build and push Docker image
         uses: docker/build-push-action@v4
         with: