you seems not finish the rebase. please make sure your code before submit for review.