base

Fix merge conflict markers that accidentally got checked in.

(They were in a comment, so it wasn't detected by the compiler.)