Good job on quickly solving the issue.

Is there any way we could add an assertion to the air_brakes tests to prevent this from happening again? At first, I don't think so since the way the merging is implemented requires manually adding things.

You can easily create a test simulating a rocket with parachute and air brakes, checking if both work. Just like the bug report.

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 75.74%. Comparing base (673ac84) to head (48d6842).
Report is 8 commits behind head on develop.

@@             Coverage Diff             @@
##           develop     #647      +/-   ##
===========================================
+ Coverage    75.71%   75.74%   +0.03%     
===========================================
  Files           81       81              
  Lines         9815     9821       +6     
===========================================
+ Hits          7431     7439       +8     
+ Misses        2384     2382       -2     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.