Merge conflicts on SteadyStateAnalysis and FlexFluxConditionComparison