fix: resolve merge conflicts in config loading and governance functions#2230

Pratham-Mishra04 merged 1 commit intov1.5.0maximhq/bifrost:v1.5.0from

03-23-chore_merge_conflicts_fixesmaximhq/bifrost:03-23-chore_merge_conflicts_fixesCopy head branch name to clipboard