diff --git a/secop_psi/ls340res.py b/secop_psi/ls340res.py
index a8f3f7c..8bf37be 100644
--- a/secop_psi/ls340res.py
+++ b/secop_psi/ls340res.py
@@ -24,7 +24,7 @@ import time
 
 from secop.datatypes import StringType, FloatRange
 from secop.modules import Parameter, Property, Readable
-from secop.stringio import HasIodev, StringIO
+from secop.io import HasIodev, StringIO
 
 
 class LscIO(StringIO):
diff --git a/secop_psi/trinamic.py b/secop_psi/trinamic.py
index e2b9437..1897772 100644
--- a/secop_psi/trinamic.py
+++ b/secop_psi/trinamic.py
@@ -28,7 +28,7 @@ from math import log10
 
 from secop.core import BoolType, Command, EnumType, FloatRange, IntRange, \
     HasIodev, Parameter, Property, Drivable, PersistentMixin, PersistentParam
-from secop.bytesio import BytesIO
+from secop.io import BytesIO
 from secop.errors import CommunicationFailedError, HardwareError, BadValueError, IsBusyError
 
 
@@ -77,15 +77,7 @@ class HwParam(PersistentParam):
 class Motor(PersistentMixin, HasIodev, Drivable):
     address = Property('module address', IntRange(0, 255), default=1)
 
-<<<<<<< HEAD
-    value = Parameter('motor position', FloatRange(unit='deg', fmtstr='%.3f'))
-=======
-    # limit_pin_mask = Property('input pin mask for lower/upper limit switch',
-    #                           TupleOf(IntRange(0, 15), IntRange(0, 15)),
-    #                           default=(8, 0))
-
     value = Parameter('motor position', FloatRange(unit='deg', fmtstr='%.3f'), poll=False, default=0)  # polling by read_status
->>>>>>> uniax
     zero = PersistentParam('zero point', FloatRange(unit='$'), readonly=False, default=0)
     encoder = HwParam('encoder reading', FloatRange(unit='$', fmtstr='%.1f'),
                       209, ANGLE_SCALE, readonly=True, initwrite=False, persistent=True)