changes for rebase fix