modifications made during rebase