diff --git a/devices/examples/HW_device_template.py b/devices/examples/HW_device_template.py
index 92ff6a32ae4915b6f7b6279e09cc8710321ea34c..dd6cad99bd5824bd1b8a37a471aeb7796f32a05d 100644
--- a/devices/examples/HW_device_template.py
+++ b/devices/examples/HW_device_template.py
@@ -14,13 +14,8 @@ from tango.server import run
 from tango import AttrWriteType
 # Additional import
 
-<<<<<<< HEAD:devices/HW_device_template.py
-from src.attribute_wrapper import *
-from src.hardware_device import *
-=======
 from util.attribute_wrapper import attribute_wrapper
 from util.hardware_device import hardware_device
->>>>>>> master:devices/examples/HW_device_template.py
 
 __all__ = ["HW_dev"]