beaglebone: solved unresolved conflict in Servo.cpp