Fixing files for rebase