manual merge with an accidental branch HEAD, on branch master.
Hope this will eliminate a scaring warning about master and origin/master
to have diverged.