diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index a70e336..c28dae6 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -47,6 +47,7 @@ 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
@@ -69,3 +70,5 @@ jobs:
           cache-to: type=gha,mode=max
           build-args: |
             PROJECT=quests_server
+=======
+>>>>>>> Stashed changes