edits after rebase