more edits to rebase