Ok my git got really confused. I'll rebase with upstream master and push all other changes after that.