diff --git a/src/helpers.py b/src/helpers.py
index 46bdee9..5103e34 100644
--- a/src/helpers.py
+++ b/src/helpers.py
@@ -389,17 +389,7 @@ def get_recordings_from_paradigm(paradigm, request):
 
     if request.COOKIES.get("synthesized_audio_in_paradigm") == "yes":
         speech_db_eq.insert(0, "synth")
-<<<<<<< HEAD
     query_terms = [query_terms[0], query_terms[1], query_terms[2], query_terms[3],query_terms[4] ]
-=======
-    query_terms = [
-        query_terms[0],
-        query_terms[1],
-        query_terms[2],
-        query_terms[3],
-        query_terms[4],
-    ]
->>>>>>> 8154cf57236c3fd90f884b57bf52dee7f01c378d
     for search_terms in divide_chunks(query_terms, 30):
         for source in speech_db_eq:
             temp.append(None)
@@ -407,19 +397,7 @@ def get_recordings_from_paradigm(paradigm, request):
     for search_terms in divide_chunks(query_terms, 30):
         for source in speech_db_eq:
             url = f"https://speech-db.altlab.app/{source}/api/bulk_search"
-<<<<<<< HEAD
             x = threading.Thread(target=get_recordings_from_url, args=(search_terms, url, temp, index,))
-=======
-            x = threading.Thread(
-                target=get_recordings_from_url,
-                args=(
-                    search_terms,
-                    url,
-                    temp,
-                    index,
-                ),
-            )
->>>>>>> 8154cf57236c3fd90f884b57bf52dee7f01c378d
             threads.append(x)
             x.start()
             index += 1
diff --git a/src/views.py b/src/views.py
index bd14e15..5d165f3 100644
--- a/src/views.py
+++ b/src/views.py
@@ -130,11 +130,7 @@ def word_details_api(request, slug: str):
         if matched_recs:
             recordings.extend(matched_recs)
     print("here we go")
-<<<<<<< HEAD
     if paradigm is not None: 
-=======
-    if paradigm is not None:
->>>>>>> 8154cf57236c3fd90f884b57bf52dee7f01c378d
         FST_DIR = settings.BASE_DIR / "res" / "fst"
         paradigm_manager = ParadigmManager(
             layout_directory=settings.LAYOUTS_DIR,
@@ -196,10 +192,7 @@ def search_api(request):
     :param request:
     :return:
     """
-<<<<<<< HEAD
     
-=======
->>>>>>> 8154cf57236c3fd90f884b57bf52dee7f01c378d
 
     query_string = request.GET.get("name")
     rw_index = request.GET.get("rw_index")
@@ -306,10 +299,6 @@ def wordnet_api(request, classification):
 
     return Response(context)
 
-<<<<<<< HEAD
-=======
-
->>>>>>> 8154cf57236c3fd90f884b57bf52dee7f01c378d
 def relabelInflectionalCategory(ic):
     with open(Path(settings.RESOURCES_DIR / "altlabel.tsv")) as f:
         labels = Relabelling.from_tsv(f)