diff --git a/src/khoj/interface/web/chat.html b/src/khoj/interface/web/chat.html
index 95ad2438..54ecf480 100644
--- a/src/khoj/interface/web/chat.html
+++ b/src/khoj/interface/web/chat.html
@@ -20,13 +20,8 @@ Hi, I am Khoj, your open, personal AI 👋🏽. I can:
 - 🌄 Generate images based on your messages
 - 🔎 Search the web for answers to your questions
 - 🎙️ Listen to your audio messages (use the mic by the input box to speak your message)
-<<<<<<< HEAD
-- 📚 Understand files you drag & drop here
-||||||| 7416ca9a
-=======
 - 📚 Understand files you drag & drop here
 - 👩🏾‍🚀 Be tuned to your conversation needs via [agents](./agents)
->>>>>>> 3c3e48b18c87a42e3b69af5dbfb86b5c8b68effa
 
 Get the Khoj [Desktop](https://khoj.dev/downloads), [Obsidian](https://docs.khoj.dev/clients/obsidian#setup), [Emacs](https://docs.khoj.dev/clients/emacs#setup) apps to search, chat with your 🖥️ computer docs. You can manage all the files you've shared with me at any time by going to [your settings](/config/content-source/computer/).