Use generics in utils.Merge (#24264)

server/config/utils.go

@@ -164,13 +164,7 @@ func FixInvalidLocales(cfg *model.Config) bool {
 // Merge merges two configs together. The receiver's values are overwritten with the patch's
 // values except when the patch's values are nil.
 func Merge(cfg *model.Config, patch *model.Config, mergeConfig *utils.MergeConfig) (*model.Config, error) {
-	ret, err := utils.Merge(cfg, patch, mergeConfig)
-	if err != nil {
-		return nil, err
-	}
-
-	retCfg := ret.(model.Config)
-	return &retCfg, nil
+	return utils.Merge(cfg, patch, mergeConfig)
 }
 
 func IsDatabaseDSN(dsn string) bool {