EKF: Fix rebase error

EKF/control.cpp

@@ -614,7 +614,7 @@ void Ekf::controlGpsFusion()
 				// use GPS velocity data to check and correct yaw angle if a FW vehicle
 				if (_control_status.flags.fixed_wing && _control_status.flags.in_air) {
 					// if flying a fixed wing aircraft, do a complete reset that includes yaw
-					_flt_mag_align_complete = realignYawGPS();
+					_control_status.flags.mag_align_complete = realignYawGPS();
 				}
 
 				resetVelocity();