making changes to rebase