# start at a common ancestor before the trends work
git checkout aef630d
git switch -c reconcile
git cherry-pick 76642d3 # master:State aggregation applies filters to itself properly
git cherry-pick 88ed102 # master:Added back for loop
git cherry-pick d3e09c2 # master:Don't apply state filter to /states/ aggregation
git cherry-pick da28b1e # master:Don't apply state filter to state aggregation, but apply to other aggregations
# Everything else is cherry-picked/done in dev
git merge dev
git merge master -s ours. # merge to master selecting only our tree (gets rid of initial revert merge)
Here's how the merge was accomplished