diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index c28dae6..5f0c0d8 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -47,28 +47,3 @@ jobs:
         env:
           DATABASE_URL: postgres://postgres:postgres@localhost:5432/quests_db
           REDIS_URL: localhost:6379
-<<<<<<< Updated upstream
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-      - name: Login to DockerHub
-        uses: docker/login-action@v2
-        with:
-          registry: quay.io
-          username: ${{ secrets.QUAY_USERNAME }}
-          password: ${{ secrets.QUAY_TOKEN }}
-      - name: Debug
-        run: ls -la
-      - name: Build and push (quests server)
-        uses: docker/build-push-action@v3
-        with:
-          context: .
-          push: true
-          tags: quay.io/decentraland/quests-server:${{ github.sha }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-          build-args: |
-            PROJECT=quests_server
-=======
->>>>>>> Stashed changes