Fix merge conflict

Author: bitterpanda63

aikido_zen/background_process/__init__.py

@@ -37,7 +37,7 @@ def start_background_process():
     if platform.system() == "Windows":
         # Python does not support Windows UDS just yet, so we have to rely on INET
         address = ("127.0.0.1", 49156)
-    if os.getenv("AIKIDO_INET_ONLY") is "1":
+    if os.getenv("AIKIDO_INET_ONLY") == "1":
         address = ("127.0.0.1", 49156)
 
     comms = AikidoIPCCommunications(address, secret_key_bytes)

aikido_zen/sinks/builtins_import.py

@@ -9,14 +9,6 @@
 
 @after
 def _import(func, instance, args, kwargs, return_value):
-    try:
-        if running_import_scan.get():
-            return
-        running_import_scan.set(True)
-
-    if not hasattr(return_value, "__package__"):
-        return
-
     try:
         if running_import_scan.get():
             return