needed a rebase, should be fine now.