fix error generated by rebase