conflict fix and logging error workaround

devices/clients/opcua_connection.py

 from threading import Thread
 import socket
-<<<<<<< HEAD
 from src.comms_client import CommClient
-=======
-from src.comms_client import *
->>>>>>> master
 import numpy
 import opcua
 from opcua import Client

devices/src/hardware_device.py

@@ -23,7 +23,7 @@ __all__ = ["hardware_device"]
 
 from src.wrappers import only_in_states
 
-@log_exceptions()
+#@log_exceptions()
 class hardware_device(Device):
     """