plan changes
big merge
fix trivial conflict
fix broken tests
merge