preparing for next rebase attemp