fixing issues with rebase