BUG: fix rebase error