diff --git a/serv_nginx/certbot/Dockerfile b/serv_nginx/certbot/Dockerfile
index 4c597ad..21cc404 100644
--- a/serv_nginx/certbot/Dockerfile
+++ b/serv_nginx/certbot/Dockerfile
@@ -9,15 +9,6 @@ RUN mkdir -p /etc/letsencrypt/config
 COPY scripts/ /opt/
 
 # Устанавливаем права
-<<<<<<< HEAD:certbot/Dockerfile
 RUN chmod +x /opt/*
-=======
-RUN chmod +x /opt/init-certbot.sh
-RUN chmod +x /opt/checkRenewCerts.sh
-RUN chmod +x /opt/renewEasysite102.sh
-RUN chmod +x /opt/renewValitovGazizCert.sh
-RUN chmod +x /opt/renewYalarbaCert.sh
-
->>>>>>> divite_services:serv_certbot/certbot/Dockerfile
 
 ENTRYPOINT ["/opt/init-certbot.sh"]