Resolving further conflicts--Gait correct