Juggling unmerged changes has consequences

Like the last commit and this one.