diff --git a/Dockerfile b/Dockerfile
index a794d92..e3c308a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -207,8 +207,3 @@ RUN python3.10 -m pip  install --user -r ./vendor/guitastro/install/requirements
 # Installing packages required for PyROS
 RUN python3.10 -m pip  install --user -r ./install/requirements.txt
 RUN python3.10 -m pip  install --user -r ./install/requirements_dev.txt
-<<<<<<< HEAD
-
-WORKDIR /home/pyros_user/app/pyros
-=======
->>>>>>> 7fd005b5084f436737a15b421bcd36e85fcb5a8f
--
libgit2 0.21.2