resolving erroneous merge conflict of search.py

diff --cc karmaworld/apps/notes/search.py
index 139be8345af240fd3dedcb6962dd0f4a4541614c,afff889c2483ccdd580293b22a61a95f6f861edc..039a27317527944d29f0631442996e2c7767149d
--- 1/karmaworld/apps/notes/search.py
--- 2/karmaworld/apps/notes/search.py
+++ b/karmaworld/apps/notes/search.py
@@@ -41,10 -44,12 +41,12 @@@ def search(query, course_id=None)
      """Returns note IDs matching the given query,
      filtered by course ID if given"""
      if course_id:
-         results = index.search('(text:"%s" OR name:"%s") AND course_id:%s' % (query, query, course_id))
+         real_query = '("%s" OR name:"%s") AND course_id:%s' % (query, query, course_id)
      else:
-         results = index.search('text:"%s" OR name:"%s"' % (query, query))
+         real_query = '"%s" OR name:"%s"' % (query, query)
  
-     matching_note_ids = [r['docid'] for r in results['results']]
+     raw_results = index.search(real_query, snippet_fields=['text'])
  
-     return matching_note_ids
+     results = {r['docid']: r['snippet_text'] for r in raw_results['results']}
+ 
 -    return results
++    return results