Oops.  Leftover >>> from a merge.
Git gives me a headache.