added print lines for cuffServo
fixed merge conflicts