Fix docker-compose.yml merge conflict

Dockerfile

@@ -10,7 +10,7 @@ ENV NODE_ENV=production
 RUN npm run build
 
 # Stage 2: Build Backend (Rust)
-FROM rust:1.75-alpine AS backend-builder
+FROM rust:1.85-alpine AS backend-builder
 WORKDIR /app/backend
 
 RUN apk add --no-cache musl-dev openssl-dev perl

docker-compose.yml

@@ -1,24 +1,14 @@
 services:
   spotify-clone:
-<<<<<<< HEAD
     image: git.khoavo.myds.me/vndangkhoa/spotify-clone:v3
-=======
-    image: git.khoavo.myds.me/vndangkhoa/spotify-clone:v5
->>>>>>> 35c9bf24f7d451c1b2717bbb9c221b29980dbc83
     container_name: spotify-clone
     restart: unless-stopped
     ports:
       - "3110:8080"
     environment:
       - PORT=8080
-<<<<<<< HEAD
     volumes:
       - ./data:/tmp/spotify-clone-downloads
-=======
-      - RUST_ENV=production
-    volumes:
-      - ./data:/app/data
->>>>>>> 35c9bf24f7d451c1b2717bbb9c221b29980dbc83
       - ./cache:/tmp/spotify-clone-cache
     logging:
       driver: "json-file"