Rename `meh` to `step`, because clarity.
Fix some handling of `base` when merging.
Workflow merging sometimes switches left/right.

Fix a test that depended on it not switching.