diff --git a/sherlock.py b/sherlock.py
index 06b7189b..3640e937 100644
--- a/sherlock.py
+++ b/sherlock.py
@@ -1,25 +1,3 @@
-<<<<<<< HEAD
-import os
-import json
-import requests
-
-# TODO: fix tumblr
-
-def print_banner():
-    print("                                              .\"\"\"-.")
-    print("                                             /      \\")
-    print("\033[37;1m ____  _               _            _        |  _..--'-.")
-    print("\033[37;1m/ ___|| |__   ___ _ __| | ___   ___| |__    >.`__.-\"\"\;\"`")
-    print("\033[37;1m\___ \| '_ \ / _ \ '__| |/ _ \ / __| |/ /   / /(     ^\\")
-    print("\033[37;1m ___) | | | |  __/ |  | | (_) | (__|   <    '-`)     =|-.")
-    print("\033[37;1m|____/|_| |_|\___|_|  |_|\___/ \___|_|\_\    /`--.'--'   \ .-.")
-    print("\033[37;1m                                           .'`-._ `.\    | J /")
-    print("\033[37;1m                                          /      `--.|   \__/\033[0m")
-
-def search_accounts(username, social_networks_params):
-    existing_accounts = list()
-
-=======
 #! /usr/bin/env python3
 
 """
@@ -125,83 +103,10 @@ def sherlock(username, verbose=False, tor=False, unique_tor=False):
     # A user agent is needed because some sites don't
     # return the correct information since they think that
     # we are bots
->>>>>>> 0d857030939da206f9e6098241ff80d869ae80e8
     headers = {
         'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:55.0) Gecko/20100101 Firefox/55.0'
     }
 
-<<<<<<< HEAD
-    for social_network in social_networks_params:
-        url = social_networks_params.get(social_network).get("url").format(username)
-        error_type = social_networks_params.get(social_network).get("errorType")
-        try:
-            response = requests.get(url, headers=headers)
-        except Exception as e:
-            print(f"error connecting to {url}: {e}")
-            continue
-
-        if error_type == "message":
-            error = social_networks_params.get(social_network).get("errorMsg")
-            if error in response.text:
-                print(f"\033[37;1m[\033[91;1m-\033[37;1m]\033[92;1m {social_network}:\033[93;1m Not Found!")
-                continue
-
-        elif error_type == "status_code":
-            if response.status_code == 404:
-                print(f"\033[37;1m[\033[91;1m-\033[37;1m]\033[92;1m {social_network}:\033[93;1m Not Found!")
-                continue
-
-        elif error_type == "response_url":
-            error = social_networks_params.get(social_network).get("errorUrl")
-            if error in response.url:
-                print(f"\033[37;1m[\033[91;1m-\033[37;1m]\033[92;1m {social_network}:\033[93;1m Not Found!")
-                continue
-
-        print(f"\033[37;1m[\033[92;1m+\033[37;1m]\033[92;1m {social_network}:\033[0m", url)
-        existing_accounts.append(url)
-
-    return existing_accounts
-
-def save_account_urls(account_urls, filename):
-    with open(filename, "a") as file:
-        file.writelines(account_urls)
-
-def remove_old_file(filename):
-    if os.path.isfile(filename):
-        os.remove(filename)
-        print(f"\033[1;92m[\033[0m\033[1;77m*\033[0m\033[1;92m] Removing previous file:\033[1;37m {filename}\033[0m")
-
-def get_social_networks_params():
-    with open("data.json", "r") as file:
-        social_networks_params = json.load(file)
-    return social_networks_params
-
-def main():
-    print_banner()
-    username = input("\033[92;1m[\033[37;1m?\033[92;1m]\033[92;1m Input Username: \033[0m")
-    print()
-
-    filename = f"{username}.txt"
-    remove_old_file(filename)
-
-    social_networks_params = get_social_networks_params()
-    if social_networks_params is None:
-        print("Error loading social networks parameters. Exiting.")
-        return
-
-    print(f"\033[1;92m[\033[0m\033[1;77m*\033[0m\033[1;92m] Checking username\033[0m\033[1;37m {username}\033[0m\033[1;92m on: \033[0m")
-
-    existing_accounts = search_accounts(username, social_networks_params)
-    if len(existing_accounts) == 0:
-        print("No accounts found. Exiting without saving.")
-        return
-
-    save_account_urls(existing_accounts, filename)
-    print(f"\033[1;92m[\033[0m\033[1;77m*\033[0m\033[1;92m] Saved: \033[37;1m{filename}\033[0m")
-
-if '__main__' in __name__:
-    main()
-=======
     # Load the data
     data_file_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), "data.json")
     with open(data_file_path, "r", encoding="utf-8") as raw:
@@ -212,7 +117,7 @@ if '__main__' in __name__:
 
     # Create session based on request methodology
     underlying_session = requests.session()
-    underlying_request = requests.Request()
+    underlying_request = requests.Request('GET')
     if tor or unique_tor:
         underlying_request = TorRequest()
         underlying_session = underlying_request.session()
@@ -247,11 +152,12 @@ if '__main__' in __name__:
             url = net_info["url"].format(username)
             results_site["url_user"] = url
 
-            # If only the status_code is needed don't download the body
-            if net_info["errorType"] == 'status_code':
-                request_method = session.head
-            else:
-                request_method = session.get
+            # # If only the status_code is needed don't download the body
+            # if net_info["errorType"] == 'status_code':
+            #     request_method = session.head
+            # else:
+            #     request_method = session.get
+            request_method = session.get
 
             # This future starts running the request in a new thread, doesn't block the main thread
             future = request_method(url=url, headers=headers)
@@ -475,5 +381,4 @@ def main():
                                    )
 
 if __name__ == "__main__":
-    main()
->>>>>>> 0d857030939da206f9e6098241ff80d869ae80e8
+    main()
\ No newline at end of file