Simple mods to the first branch, with conflict.

Nothing to see here.  Move along.