changed 'merge' to 'rebase'