Ok should have fixed it, ended up doin my first rebase and then a push --force