diff --git a/kitabcitab/components/Result.js b/kitabcitab/components/Result.js
index 561a0a23..6f663c2b 100644
--- a/kitabcitab/components/Result.js
+++ b/kitabcitab/components/Result.js
@@ -8,14 +8,6 @@ const Result = ({result, term}) => {
     const [title, setTitle] = useState()
     let sentences
 
-<<<<<<< Updated upstream
-    const checkForMatches = (props) => {
-      if(props.length !== 1) return sentences.map((sentence) => {
-        sentence.toLowerCase().includes(term.toLowerCase()) ? setTitle(sentence) : null
-      })
-      
-      return setTitle(text)
-=======
     const checkForMatches = (props) => {      
       if(props.length === 1) return setTitle(props)
       if(props.length > 1){
@@ -23,7 +15,6 @@ const Result = ({result, term}) => {
           if(sentence.toLowerCase().includes(term.toLowerCase())) setTitle(sentence)
         })
       } else setTitle(props[0])
->>>>>>> Stashed changes
       
     }