Fix merge error

Grr. Resolved means resolved. Not "please leave conflict resolution
markup in the source files and allow me to commit regardless"...