[FIX] fix error during rebase