diff --git a/AirlockTools.py b/AirlockTools.py
index ac76d31..6454786 100644
--- a/AirlockTools.py
+++ b/AirlockTools.py
@@ -34,13 +34,8 @@ dotenv.load_dotenv()
 #Constants
 url = os.getenv('url')
 bad_publisher_list = ["Brave","Zoom", "GlavSoft", "VNC"]
-<<<<<<< HEAD
-pups = ["logmein", "invalid" , "nmap"]
-badpathparts = ["users", "wwwroot", "windows\\temp", "windows\\task", "windows\\system32", "startup", "windows\\fonts", "Recycle.Bin", "AppData", "programdata", "Solarwinds", "kaseya", "Windows\\assembly", "WindowsPowerShell\\Modules"]
-=======
 pups = ["logmein", "invalid", "nmap"]
 badpathparts = ["users", "wwwroot", "windows\\temp", "windows\\task", "windows\\system32", "startup", "windows\\fonts", "Recycle.Bin", "AppData", "programdata", "Solarwinds", "kaseya"]
->>>>>>> 0c7e8b5 (Updated Bad Lists)
 path_exclusion_constant = 4
 min_files_for_path = 4
 threat_tolerance_constant = 4