diff --git a/README.md b/README.md
index 90a4b6b..64b452d 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 ================================================================================
 HestiaCP + Django + Gunicorn Setup - Complete Checklist
 Prepared by: MohammadAmin Baranzehi
@@ -116,7 +115,3 @@ Enjoy your stable Django setup on HestiaCP!
 Prepared by: MohammadAmin Baranzehi
 Website / Contact: hacktube.ir
 ================================================================================
-=======
-# hestia-django-gunicorn
-Deploy Django apps on HestiaCP with Gunicorn &amp; unix socket — fast, secure, no manual nginx edits. Custom templates + auto-service script.
->>>>>>> 9ede1576af8004ef9d23bc82b745ca89eaf7ceb6