fix issues caused by rebase