fix merge conflicts

Author: NutsaB

internal/collector/nginxplusreceiver/config.go

@@ -16,10 +16,7 @@ import (
 	"github.com/nginx/agent/v3/internal/collector/nginxplusreceiver/internal/metadata"
 )
 
-const (
-	defaultCollectInterval = 10 * time.Second
-	defaultTimeout         = 10 * time.Second
-)
+const defaultCollectInterval = 10 * time.Second
 
 type Config struct {
 	confighttp.ClientConfig        `mapstructure:",squash"`