teleop merge