Rebasing config files