update files consistency after rebase