Fixed merge regressions in RemoteConfigSpec