Fix merge conflict

Author: bitterpanda63

aikido_zen/sinks/builtins_import.py

@@ -9,6 +9,12 @@
 
 @after
 def _import(func, instance, args, kwargs, return_value):
+    if not hasattr(return_value, "__file__"):
+        return  # Would be built-in into the interpreter (system package)
+
+    if not hasattr(return_value, "__package__"):
+        return
+
     try:
         if running_import_scan.get():
             return