resolve conflicts, Motor Quadratur Encoder works