fix build err when doing rebase