fix dockerfile

Dockerfile

@@ -4,7 +4,6 @@ WORKDIR /mcpo
 
 COPY requirements.txt requirements.txt
 
-<<<<<<< HEAD
 COPY mcpo_config.yaml mcpo_config.yaml
 
 COPY config_builder.py config_builder.py
@@ -13,24 +12,13 @@ COPY gitea_mcp_set.sh gitea_mcp_set.sh
 
 COPY .env .env
 
-=======
-COPY mcpo_config.json mcpo_config.json
-
-COPY gitea_mcp_set.sh gitea_mcp_set.sh
-
->>>>>>> d186565 (first iteration of the service)
 RUN apt-get update -y && apt-get install -y python3 virtualenv wget tar python3-pip python3-pip
 
 RUN ./gitea_mcp_set.sh
 
 RUN pip install -r requirements.txt --break-system-packages
 
-<<<<<<< HEAD
 RUN python3 config_builder.py
 
 EXPOSE 8000
 ENTRYPOINT ["mcpo", "--config", "/mcpo/config.json"]
-=======
-EXPOSE 8000
-ENTRYPOINT ["mcpo", "--config", "/mcpo/mcpo_config.json"]
->>>>>>> d186565 (first iteration of the service)