resolve conflicts

.github/workflows/docker-build-push-dockerhub.yml

@@ -79,18 +79,11 @@ jobs:
 
       - name: Start database
         run: |
-          docker compose up -d database
+          docker-compose up -d database
-          
-      - name: Create builder
-        run: docker context create builders
-      
-      - name: Use builder
-        run: docker context use builders
           
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
         with:
-          endpoint: builders
           driver-opts: |
             network=container:database
           buildkitd-flags: |
@@ -102,22 +95,10 @@ jobs:
         with:
           context: ./
           file: ./Dockerfile
-<<<<<<< HEAD
           push: ${{ github.event_name != 'pull_request' }}
-=======
-          push: true
-<<<<<<< HEAD
->>>>>>> f652dce (enable push)
           platforms: linux/amd64,linux/arm64
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-=======
-          platforms: linux/arm64
-          tags: |
-            docker.io/${{ secrets.DOCKER_HUB_USERNAME }}/calendso:canary
-            docker.io/calcom/cal.com:canary
-            ghcr.io/calcom/web:canary
->>>>>>> 2dfa73c (temporarily remove amd64)
           build-args: |
             NEXT_PUBLIC_WEBAPP_URL=${{ env.NEXT_PUBLIC_WEBAPP_URL }}
             NEXT_PUBLIC_LICENSE_CONSENT=${{ env.NEXT_PUBLIC_LICENSE_CONSENT }}