Hassle with git. Merge markup in *.m files.

 Somehow, some of my *.m files included merge markup, e.g., <<<<<HEAD …
that kind of thing.