rebase fix attempt