Refactor the bejeezus out of Conflict.all.

When rebasing, flip "ours" and "theirs".