Recovering from the Git conflict fiasco while attempting to rebase
the layoutfixes branch.  I don't understand this aspect of Git
nearly well enough.