missing files after rebase