fix rebase error in on-target