diff --git a/Dockerfile b/Dockerfile
index 2dc641850a323c53e2c0ea3e6fb2a9a3fe9f777b..9c0b84782773af72d704372cf420aba6a6a8bdfd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,16 +5,6 @@ RUN apt update
 RUN apt install -y python3 gcc python3-pip
 RUN apt install -y openssh-client
 RUN pip3 install -r requirements.txt
-<<<<<<< HEAD
 RUN python3 ./setup.py install
-=======
-RUN mkdir -p /var/log/strudel2
-RUN pwd
-RUN ls
-RUN cd TES ; python3 ./setup.py install
-RUN pwd
-RUN ls
-RUN cd TWS ; python3 ./setup.py install
->>>>>>> Updated Scripts
 EXPOSE 8080 8090
 CMD ["./runscript"]