resolving merge conflicts in hydra teleop