Yaw is in control
merge