Fixed rebase -i issue