think I picked the wrong thing in a git rebase; fixed