Merge Simple Teleop and SimpleTeleop