Did this work?
try rebase
add stuff pre rebase attempt