diff --git a/src/main/flight/pid.c b/src/main/flight/pid.c
index 431172a117..19fdbeee93 100644
--- a/src/main/flight/pid.c
+++ b/src/main/flight/pid.c
@@ -364,8 +364,13 @@ void pidInitConfig(const pidProfile_t *pidProfile)
     crashLimitYaw = pidProfile->crash_limit_yaw;
     itermLimit = pidProfile->itermLimit;
     throttleBoost = pidProfile->throttle_boost * 0.1f;
+<<<<<<< HEAD
     itermRotation = pidProfile->iterm_rotation;
     smartFeedforward = pidProfile->smart_feedforward;
+=======
+    smartFeedforward = pidProfile->smart_feedforward;
+    itermRotation = pidProfile->iterm_rotation;
+>>>>>>> incorporate style feedback
     itermRelax = pidProfile->iterm_relax;
     itermRelaxCutoffLow = pidProfile->iterm_relax_cutoff_low;
     itermRelaxCutoffHigh = pidProfile->iterm_relax_cutoff_high;