Remove merge leftovers

I did a quick `grep` and that's the only one.