diff --git a/Dockerfile b/Dockerfile
index e359e7b..b7d6fc9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,4 @@
-<<<<<<< HEAD
-
 FROM node:hydrogen-alpine3.15 AS builder
-=======
-FROM node:16.16.0-alpine3.15 AS builder
->>>>>>> main
 ADD . /app
 RUN apk add bash
 RUN apk add --no-cache \
@@ -25,11 +20,7 @@ RUN npm run build
 # RUN npm run build
 
 
-<<<<<<< HEAD
 FROM node:hydrogen-alpine3.15
-=======
-FROM node:16.16.0-alpine3.15
->>>>>>> main
 RUN apk add bash
 RUN apk add --no-cache \
         python3 \