rebase public and config