Quick fix for my previous merge commit

I guess I didn't :w in vim with the conflict before running the
`git-add`. Anyway, this is the merge conflict resolution for
1ab792a9ee9d.