diff --git a/Sandbox Scripts/extract.py b/Sandbox Scripts/extract.py
index 19fcee6..2272788 100644
--- a/Sandbox Scripts/extract.py	
+++ b/Sandbox Scripts/extract.py	
@@ -63,19 +63,6 @@ def extract(filename):
 
 
 if __name__ == "__main__":
-<<<<<<< HEAD
-    path = ""
-    if len(sys.argv) > 1:
-        path = sys.argv[1]
-        print("Path: " + path)
-        #Make sure there's a trailing slash
-        pathRE = re.search(INREGEX, path)
-        if pathRE is None:
-            path += "\\\\"
-    else:
-        path = "./"
-=======
->>>>>>> parent of af712a2 (allows passing an input path as argument)
     # let's do this in parallel, using cpu count as number of threads
     pool = Pool(None)
     res = pool.map(extract, glob.iglob("*.%s" % EXTENSION))