Try again for a merge

Sorry about that; should have fetched and rebased first.  Hopefully this one'll go.