diff --git a/Dockerfile b/Dockerfile
index 3e3dc8a..5830068 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # pull official base image
 FROM node:13.12.0-alpine
 
@@ -36,17 +35,3 @@ CMD ["npm", "start"]
 # RUN npm install -g gatsby-cli
 
 # CMD ['gatsby', 'develop', '-H', '0.0.0.0:8000']
-=======
-FROM node:14.4.0
-
-WORKDIR /usr/src/app
-
-COPY package*.json ./
-RUN npm install
-
-COPY . .
-
-RUN npm install -g gatsby-cli
-
-CMD ['gatsby', 'develop', '-H', '0.0.0.0:8000']
->>>>>>> feature/2_forms