updated base teleop
fixed conflicts