HEAD error from merge

Sorry, this one slipped through.
Too many forward and backward commits at the one time, Git couldn't handle it, and I let this one get by.