Fixed walking left and right at constant speeds
Fixed merge conflict