diff --git a/Frontend/Dockerfile b/Frontend/Dockerfile
index 001b7ea..278b4e0 100644
--- a/Frontend/Dockerfile
+++ b/Frontend/Dockerfile
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-FROM node:latest as build-stage
-=======
 FROM node:20.9.0-bullseye-slim as build-stage
->>>>>>> 307e732608fca31b60027b417412691ff0e1c2f0
 WORKDIR /app
 COPY package*.json ./
 RUN npm install