diff --git a/src/khoj/interface/web/chat.html b/src/khoj/interface/web/chat.html
index 8224db65..abab83ab 100644
--- a/src/khoj/interface/web/chat.html
+++ b/src/khoj/interface/web/chat.html
@@ -147,24 +147,6 @@ To get started, just start typing below. You can also type / to see a list of co
 
         function processOnlineReferences(referenceSection, onlineContext) {
             let numOnlineReferences = 0;
-<<<<<<< Updated upstream
-            for (let subquery in onlineContext) {
-                let onlineReference = onlineContext[subquery];
-                if (onlineReference.organic && onlineReference.organic.length > 0) {
-                    numOnlineReferences += onlineReference.organic.length;
-                    for (let index in onlineReference.organic) {
-                        let reference = onlineReference.organic[index];
-                    let polishedReference = generateOnlineReference(reference, index);
-                    referenceSection.appendChild(polishedReference);
-                    }
-||||||| Stash base
-            if (onlineContext.organic && onlineContext.organic.length > 0) {
-                numOnlineReferences += onlineContext.organic.length;
-                for (let index in onlineContext.organic) {
-                    let reference = onlineContext.organic[index];
-                    let polishedReference = generateOnlineReference(reference, index);
-                    referenceSection.appendChild(polishedReference);
-=======
             for (let subquery in onlineContext) {
                 let onlineReference = onlineContext[subquery];
                 if (onlineReference.organic && onlineReference.organic.length > 0) {
@@ -174,25 +156,8 @@ To get started, just start typing below. You can also type / to see a list of co
                         let polishedReference = generateOnlineReference(reference, index);
                         referenceSection.appendChild(polishedReference);
                     }
->>>>>>> Stashed changes
                 }
 
-<<<<<<< Updated upstream
-                if (onlineReference.knowledgeGraph && onlineReference.knowledgeGraph.length > 0) {
-                    numOnlineReferences += onlineReference.knowledgeGraph.length;
-                    for (let index in onlineReference.knowledgeGraph) {
-                        let reference = onlineReference.knowledgeGraph[index];
-                    let polishedReference = generateOnlineReference(reference, index);
-                    referenceSection.appendChild(polishedReference);
-                    }
-||||||| Stash base
-            if (onlineContext.knowledgeGraph && onlineContext.knowledgeGraph.length > 0) {
-                numOnlineReferences += onlineContext.knowledgeGraph.length;
-                for (let index in onlineContext.knowledgeGraph) {
-                    let reference = onlineContext.knowledgeGraph[index];
-                    let polishedReference = generateOnlineReference(reference, index);
-                    referenceSection.appendChild(polishedReference);
-=======
                 if (onlineReference.knowledgeGraph && onlineReference.knowledgeGraph.length > 0) {
                     numOnlineReferences += onlineReference.knowledgeGraph.length;
                     for (let index in onlineReference.knowledgeGraph) {
@@ -200,7 +165,6 @@ To get started, just start typing below. You can also type / to see a list of co
                         let polishedReference = generateOnlineReference(reference, index);
                         referenceSection.appendChild(polishedReference);
                     }
->>>>>>> Stashed changes
                 }
 
                 if (onlineReference.peopleAlsoAsk && onlineReference.peopleAlsoAsk.length > 0) {