diff --git a/devices/clients/opcua_connection.py b/devices/clients/opcua_connection.py
index ea98b340d84fc3a2e9e3a63f65cffab51fd81046..85962f4216013af69733eeab145ce2d39e460a5b 100644
--- a/devices/clients/opcua_connection.py
+++ b/devices/clients/opcua_connection.py
@@ -1,10 +1,6 @@
 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
diff --git a/devices/src/hardware_device.py b/devices/src/hardware_device.py
index bd570d3ff32ec3b3b7dc9743ac5c2a1745efd9fa..2a2dafb57dbfcf36ae7b232619bf7b24447385d0 100644
--- a/devices/src/hardware_device.py
+++ b/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):
     """