servos mapped correctly
merged