update config
updat config after rebase and cleanup