massive commit, resolved (with checkout) wrong rebase