#6feng fix rebase bug