The Effect of Online Adaptation on Conflicts in Haptic Shared Control for Free-Air Teleoperation Tasks