lost new highlight in rebase