diff --git a/README.md b/README.md
index fb8acb9..9857f8d 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Podcast Server 🚀
 
 A lightweight, professional-grade podcast hosting and management platform designed for churches and small organizations. Built with PHP 8 and MySQL, this system provides a seamless way to host audio content, track analytics, and engage listeners via push notifications.
@@ -88,4 +87,4 @@ This project is licensed under the MIT License.
 # Podcast-server
 
 A lightweight, professional-grade podcast hosting and management platform designed for churches and small organizations. Built with PHP 8 and MySQL, this system provides a seamless way to host audio content, track analytics, and engage listeners via push notifications.
->>>>>>> de0edf94110f2fe94fafd5cb8cf258079f336584
+