resolved more merge conflicts

binaryc_python_utils/custom_logging_functions.py

@@ -273,4 +273,4 @@ def create_and_load_logging_function(custom_logging_code):
     # Get memory adress of function. mimicking a pointer
     func_memaddr = ctypes.cast(libmean.custom_output_function, ctypes.c_void_p).value
 
-    return func_memaddr
+    return func_memaddr
\ No newline at end of file