BUG remove files from rebase errors