fixed up the grand rebase and branch deletion work