diff --git a/Dockerfile b/Dockerfile
index 1e7014a..c0837cb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,3 @@
-<<<<<<< HEAD
-FROM python:3.14.3-alpine3.22
-COPY ./app /app
-WORKDIR /app
-RUN apk add ffmpeg deno
-RUN pip install -r requirements.txt
-CMD ["python", "/app/main.py"]
-=======
 # Portions of this Dockerfile are sourced from GPLv3 licensed `yt-dlp slim` by Henrique Almeida (https://github.com/h3nc4/yt-dlp-slim)
 # Derivations to this Dockerfile in this repository following March 3, 2026 should be considered licensed under this project's MIT license (see ../LICENSE) unless otherwise stated
 
@@ -96,5 +88,4 @@ LABEL org.opencontainers.image.title="yt-dlp bot" \
   org.opencontainers.image.authors="William Peebles <me@williamtpeebles.com>" \
   org.opencontainers.image.vendor="William Peebles" \
   org.opencontainers.image.licenses="MIT" \
-  org.opencontainers.image.source="https://git.dubyatp.xyz/williamp/yt-dlp-bot"
->>>>>>> v1-refactor
+  org.opencontainers.image.source="https://git.dubyatp.xyz/williamp/yt-dlp-bot"
\ No newline at end of file