fix several lines after rebase