My last manual merge screwed things up.  Manually merge again to fix