diff --git a/sdk/proto/nap.pb.go b/sdk/proto/nap.pb.go
index 528861130..01467bf06 100644
--- a/sdk/proto/nap.pb.go
+++ b/sdk/proto/nap.pb.go
@@ -280,14 +280,6 @@ func (m *AppProtectWAFDetails) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	_ = i
 	var l int
 	_ = l
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 	if m.XXX_unrecognized != nil {
 		i -= len(m.XXX_unrecognized)
 		copy(dAtA[i:], m.XXX_unrecognized)
@@ -327,172 +319,6 @@ func (m *AppProtectWAFDetails) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 		i = encodeVarintNap(dAtA, i, uint64(len(m.ThreatCampaignsVersion)))
 		i--
 		dAtA[i] = 0x1a
-=======
-=======
->>>>>>> aeb0dc74 (Create dedicated cache and upstream metrics reports)
-=======
->>>>>>> b1c864fb (Create dedicated cache and upstream metrics reports)
-=======
->>>>>>> 1accccec (Create dedicated cache and upstream metrics reports)
-	if len(m.WafVersion) > 0 {
-		dAtA[i] = 0xa
-		i++
-		i = encodeVarintNap(dAtA, i, uint64(len(m.WafVersion)))
-		i += copy(dAtA[i:], m.WafVersion)
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
->>>>>>> b0c49853 (Create dedicated cache and upstream metrics reports)
-	}
-	if len(m.AttackSignaturesVersion) > 0 {
-		dAtA[i] = 0x12
-		i++
-		i = encodeVarintNap(dAtA, i, uint64(len(m.AttackSignaturesVersion)))
-		i += copy(dAtA[i:], m.AttackSignaturesVersion)
-	}
-	if len(m.ThreatCampaignsVersion) > 0 {
-		dAtA[i] = 0x1a
-		i++
-		i = encodeVarintNap(dAtA, i, uint64(len(m.ThreatCampaignsVersion)))
-		i += copy(dAtA[i:], m.ThreatCampaignsVersion)
-=======
-	if m.XXX_unrecognized != nil {
-		i -= len(m.XXX_unrecognized)
-		copy(dAtA[i:], m.XXX_unrecognized)
->>>>>>> 29a5bd11 (adds updated generated files from protobuf)
-	}
-	if m.Health != nil {
-		{
-			size, err := m.Health.MarshalToSizedBuffer(dAtA[:i])
-			if err != nil {
-				return 0, err
-			}
-			i -= size
-			i = encodeVarintNap(dAtA, i, uint64(size))
-		}
-		i--
-		dAtA[i] = 0x22
-	}
-	if len(m.ThreatCampaignsVersion) > 0 {
-		i -= len(m.ThreatCampaignsVersion)
-		copy(dAtA[i:], m.ThreatCampaignsVersion)
-		i = encodeVarintNap(dAtA, i, uint64(len(m.ThreatCampaignsVersion)))
-		i--
-		dAtA[i] = 0x1a
-=======
->>>>>>> aeb0dc74 (Create dedicated cache and upstream metrics reports)
-	}
-	if len(m.AttackSignaturesVersion) > 0 {
-		dAtA[i] = 0x12
-		i++
-		i = encodeVarintNap(dAtA, i, uint64(len(m.AttackSignaturesVersion)))
-		i += copy(dAtA[i:], m.AttackSignaturesVersion)
-	}
-	if len(m.ThreatCampaignsVersion) > 0 {
-		dAtA[i] = 0x1a
-		i++
-		i = encodeVarintNap(dAtA, i, uint64(len(m.ThreatCampaignsVersion)))
-		i += copy(dAtA[i:], m.ThreatCampaignsVersion)
-=======
-	if m.XXX_unrecognized != nil {
-		i -= len(m.XXX_unrecognized)
-		copy(dAtA[i:], m.XXX_unrecognized)
->>>>>>> 4e412375 (adds updated generated files from protobuf)
-	}
-	if m.Health != nil {
-		{
-			size, err := m.Health.MarshalToSizedBuffer(dAtA[:i])
-			if err != nil {
-				return 0, err
-			}
-			i -= size
-			i = encodeVarintNap(dAtA, i, uint64(size))
-		}
-		i--
-		dAtA[i] = 0x22
-	}
-	if len(m.ThreatCampaignsVersion) > 0 {
-		i -= len(m.ThreatCampaignsVersion)
-		copy(dAtA[i:], m.ThreatCampaignsVersion)
-		i = encodeVarintNap(dAtA, i, uint64(len(m.ThreatCampaignsVersion)))
-		i--
-		dAtA[i] = 0x1a
-=======
->>>>>>> b1c864fb (Create dedicated cache and upstream metrics reports)
-	}
-	if len(m.AttackSignaturesVersion) > 0 {
-		dAtA[i] = 0x12
-		i++
-		i = encodeVarintNap(dAtA, i, uint64(len(m.AttackSignaturesVersion)))
-		i += copy(dAtA[i:], m.AttackSignaturesVersion)
-	}
-	if len(m.ThreatCampaignsVersion) > 0 {
-		dAtA[i] = 0x1a
-		i++
-		i = encodeVarintNap(dAtA, i, uint64(len(m.ThreatCampaignsVersion)))
-		i += copy(dAtA[i:], m.ThreatCampaignsVersion)
-=======
-	if m.XXX_unrecognized != nil {
-		i -= len(m.XXX_unrecognized)
-		copy(dAtA[i:], m.XXX_unrecognized)
->>>>>>> 032649b5 (adds updated generated files from protobuf)
-	}
-	if m.Health != nil {
-		{
-			size, err := m.Health.MarshalToSizedBuffer(dAtA[:i])
-			if err != nil {
-				return 0, err
-			}
-			i -= size
-			i = encodeVarintNap(dAtA, i, uint64(size))
-		}
-		i--
-		dAtA[i] = 0x22
-	}
-	if len(m.ThreatCampaignsVersion) > 0 {
-		i -= len(m.ThreatCampaignsVersion)
-		copy(dAtA[i:], m.ThreatCampaignsVersion)
-		i = encodeVarintNap(dAtA, i, uint64(len(m.ThreatCampaignsVersion)))
-		i--
-		dAtA[i] = 0x1a
-=======
->>>>>>> 1accccec (Create dedicated cache and upstream metrics reports)
-	}
-	if len(m.AttackSignaturesVersion) > 0 {
-		dAtA[i] = 0x12
-		i++
-		i = encodeVarintNap(dAtA, i, uint64(len(m.AttackSignaturesVersion)))
-		i += copy(dAtA[i:], m.AttackSignaturesVersion)
-	}
-	if len(m.ThreatCampaignsVersion) > 0 {
-		dAtA[i] = 0x1a
-		i++
-		i = encodeVarintNap(dAtA, i, uint64(len(m.ThreatCampaignsVersion)))
-		i += copy(dAtA[i:], m.ThreatCampaignsVersion)
-=======
-	if m.XXX_unrecognized != nil {
-		i -= len(m.XXX_unrecognized)
-		copy(dAtA[i:], m.XXX_unrecognized)
->>>>>>> 506308d4 (adds updated generated files from protobuf)
-	}
-	if m.Health != nil {
-		{
-			size, err := m.Health.MarshalToSizedBuffer(dAtA[:i])
-			if err != nil {
-				return 0, err
-			}
-			i -= size
-			i = encodeVarintNap(dAtA, i, uint64(size))
-		}
-		i--
-		dAtA[i] = 0x22
-	}
-	if len(m.ThreatCampaignsVersion) > 0 {
-		i -= len(m.ThreatCampaignsVersion)
-		copy(dAtA[i:], m.ThreatCampaignsVersion)
-		i = encodeVarintNap(dAtA, i, uint64(len(m.ThreatCampaignsVersion)))
-		i--
-		dAtA[i] = 0x1a
 	}
 	if len(m.AttackSignaturesVersion) > 0 {
 		i -= len(m.AttackSignaturesVersion)
diff --git a/test/performance/vendor/github.com/nginx/agent/sdk/v2/proto/nap.pb.go b/test/performance/vendor/github.com/nginx/agent/sdk/v2/proto/nap.pb.go
index 528861130..01467bf06 100644
--- a/test/performance/vendor/github.com/nginx/agent/sdk/v2/proto/nap.pb.go
+++ b/test/performance/vendor/github.com/nginx/agent/sdk/v2/proto/nap.pb.go
@@ -280,14 +280,6 @@ func (m *AppProtectWAFDetails) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	_ = i
 	var l int
 	_ = l
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 	if m.XXX_unrecognized != nil {
 		i -= len(m.XXX_unrecognized)
 		copy(dAtA[i:], m.XXX_unrecognized)
@@ -327,172 +319,6 @@ func (m *AppProtectWAFDetails) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 		i = encodeVarintNap(dAtA, i, uint64(len(m.ThreatCampaignsVersion)))
 		i--
 		dAtA[i] = 0x1a
-=======
-=======
->>>>>>> aeb0dc74 (Create dedicated cache and upstream metrics reports)
-=======
->>>>>>> b1c864fb (Create dedicated cache and upstream metrics reports)
-=======
->>>>>>> 1accccec (Create dedicated cache and upstream metrics reports)
-	if len(m.WafVersion) > 0 {
-		dAtA[i] = 0xa
-		i++
-		i = encodeVarintNap(dAtA, i, uint64(len(m.WafVersion)))
-		i += copy(dAtA[i:], m.WafVersion)
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
->>>>>>> b0c49853 (Create dedicated cache and upstream metrics reports)
-	}
-	if len(m.AttackSignaturesVersion) > 0 {
-		dAtA[i] = 0x12
-		i++
-		i = encodeVarintNap(dAtA, i, uint64(len(m.AttackSignaturesVersion)))
-		i += copy(dAtA[i:], m.AttackSignaturesVersion)
-	}
-	if len(m.ThreatCampaignsVersion) > 0 {
-		dAtA[i] = 0x1a
-		i++
-		i = encodeVarintNap(dAtA, i, uint64(len(m.ThreatCampaignsVersion)))
-		i += copy(dAtA[i:], m.ThreatCampaignsVersion)
-=======
-	if m.XXX_unrecognized != nil {
-		i -= len(m.XXX_unrecognized)
-		copy(dAtA[i:], m.XXX_unrecognized)
->>>>>>> 29a5bd11 (adds updated generated files from protobuf)
-	}
-	if m.Health != nil {
-		{
-			size, err := m.Health.MarshalToSizedBuffer(dAtA[:i])
-			if err != nil {
-				return 0, err
-			}
-			i -= size
-			i = encodeVarintNap(dAtA, i, uint64(size))
-		}
-		i--
-		dAtA[i] = 0x22
-	}
-	if len(m.ThreatCampaignsVersion) > 0 {
-		i -= len(m.ThreatCampaignsVersion)
-		copy(dAtA[i:], m.ThreatCampaignsVersion)
-		i = encodeVarintNap(dAtA, i, uint64(len(m.ThreatCampaignsVersion)))
-		i--
-		dAtA[i] = 0x1a
-=======
->>>>>>> aeb0dc74 (Create dedicated cache and upstream metrics reports)
-	}
-	if len(m.AttackSignaturesVersion) > 0 {
-		dAtA[i] = 0x12
-		i++
-		i = encodeVarintNap(dAtA, i, uint64(len(m.AttackSignaturesVersion)))
-		i += copy(dAtA[i:], m.AttackSignaturesVersion)
-	}
-	if len(m.ThreatCampaignsVersion) > 0 {
-		dAtA[i] = 0x1a
-		i++
-		i = encodeVarintNap(dAtA, i, uint64(len(m.ThreatCampaignsVersion)))
-		i += copy(dAtA[i:], m.ThreatCampaignsVersion)
-=======
-	if m.XXX_unrecognized != nil {
-		i -= len(m.XXX_unrecognized)
-		copy(dAtA[i:], m.XXX_unrecognized)
->>>>>>> 4e412375 (adds updated generated files from protobuf)
-	}
-	if m.Health != nil {
-		{
-			size, err := m.Health.MarshalToSizedBuffer(dAtA[:i])
-			if err != nil {
-				return 0, err
-			}
-			i -= size
-			i = encodeVarintNap(dAtA, i, uint64(size))
-		}
-		i--
-		dAtA[i] = 0x22
-	}
-	if len(m.ThreatCampaignsVersion) > 0 {
-		i -= len(m.ThreatCampaignsVersion)
-		copy(dAtA[i:], m.ThreatCampaignsVersion)
-		i = encodeVarintNap(dAtA, i, uint64(len(m.ThreatCampaignsVersion)))
-		i--
-		dAtA[i] = 0x1a
-=======
->>>>>>> b1c864fb (Create dedicated cache and upstream metrics reports)
-	}
-	if len(m.AttackSignaturesVersion) > 0 {
-		dAtA[i] = 0x12
-		i++
-		i = encodeVarintNap(dAtA, i, uint64(len(m.AttackSignaturesVersion)))
-		i += copy(dAtA[i:], m.AttackSignaturesVersion)
-	}
-	if len(m.ThreatCampaignsVersion) > 0 {
-		dAtA[i] = 0x1a
-		i++
-		i = encodeVarintNap(dAtA, i, uint64(len(m.ThreatCampaignsVersion)))
-		i += copy(dAtA[i:], m.ThreatCampaignsVersion)
-=======
-	if m.XXX_unrecognized != nil {
-		i -= len(m.XXX_unrecognized)
-		copy(dAtA[i:], m.XXX_unrecognized)
->>>>>>> 032649b5 (adds updated generated files from protobuf)
-	}
-	if m.Health != nil {
-		{
-			size, err := m.Health.MarshalToSizedBuffer(dAtA[:i])
-			if err != nil {
-				return 0, err
-			}
-			i -= size
-			i = encodeVarintNap(dAtA, i, uint64(size))
-		}
-		i--
-		dAtA[i] = 0x22
-	}
-	if len(m.ThreatCampaignsVersion) > 0 {
-		i -= len(m.ThreatCampaignsVersion)
-		copy(dAtA[i:], m.ThreatCampaignsVersion)
-		i = encodeVarintNap(dAtA, i, uint64(len(m.ThreatCampaignsVersion)))
-		i--
-		dAtA[i] = 0x1a
-=======
->>>>>>> 1accccec (Create dedicated cache and upstream metrics reports)
-	}
-	if len(m.AttackSignaturesVersion) > 0 {
-		dAtA[i] = 0x12
-		i++
-		i = encodeVarintNap(dAtA, i, uint64(len(m.AttackSignaturesVersion)))
-		i += copy(dAtA[i:], m.AttackSignaturesVersion)
-	}
-	if len(m.ThreatCampaignsVersion) > 0 {
-		dAtA[i] = 0x1a
-		i++
-		i = encodeVarintNap(dAtA, i, uint64(len(m.ThreatCampaignsVersion)))
-		i += copy(dAtA[i:], m.ThreatCampaignsVersion)
-=======
-	if m.XXX_unrecognized != nil {
-		i -= len(m.XXX_unrecognized)
-		copy(dAtA[i:], m.XXX_unrecognized)
->>>>>>> 506308d4 (adds updated generated files from protobuf)
-	}
-	if m.Health != nil {
-		{
-			size, err := m.Health.MarshalToSizedBuffer(dAtA[:i])
-			if err != nil {
-				return 0, err
-			}
-			i -= size
-			i = encodeVarintNap(dAtA, i, uint64(size))
-		}
-		i--
-		dAtA[i] = 0x22
-	}
-	if len(m.ThreatCampaignsVersion) > 0 {
-		i -= len(m.ThreatCampaignsVersion)
-		copy(dAtA[i:], m.ThreatCampaignsVersion)
-		i = encodeVarintNap(dAtA, i, uint64(len(m.ThreatCampaignsVersion)))
-		i--
-		dAtA[i] = 0x1a
 	}
 	if len(m.AttackSignaturesVersion) > 0 {
 		i -= len(m.AttackSignaturesVersion)
diff --git a/test/performance/vendor/github.com/nginx/agent/v2/src/plugins/metrics_sender.go b/test/performance/vendor/github.com/nginx/agent/v2/src/plugins/metrics_sender.go
index b23c976f7..d982ee26c 100644
--- a/test/performance/vendor/github.com/nginx/agent/v2/src/plugins/metrics_sender.go
+++ b/test/performance/vendor/github.com/nginx/agent/v2/src/plugins/metrics_sender.go
@@ -72,7 +72,7 @@ func (r *MetricsSender) Process(msg *core.Message) {
 			if !r.readyToSend.Load() {
 				continue
 			}
-			
+
 			switch report := p.(type) {
 			case *proto.MetricsReport:
 				message := client.MessageFromMetrics(report)
diff --git a/vendor/github.com/nginx/agent/sdk/v2/proto/nap.pb.go b/vendor/github.com/nginx/agent/sdk/v2/proto/nap.pb.go
index 528861130..01467bf06 100644
--- a/vendor/github.com/nginx/agent/sdk/v2/proto/nap.pb.go
+++ b/vendor/github.com/nginx/agent/sdk/v2/proto/nap.pb.go
@@ -280,14 +280,6 @@ func (m *AppProtectWAFDetails) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	_ = i
 	var l int
 	_ = l
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 	if m.XXX_unrecognized != nil {
 		i -= len(m.XXX_unrecognized)
 		copy(dAtA[i:], m.XXX_unrecognized)
@@ -327,172 +319,6 @@ func (m *AppProtectWAFDetails) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 		i = encodeVarintNap(dAtA, i, uint64(len(m.ThreatCampaignsVersion)))
 		i--
 		dAtA[i] = 0x1a
-=======
-=======
->>>>>>> aeb0dc74 (Create dedicated cache and upstream metrics reports)
-=======
->>>>>>> b1c864fb (Create dedicated cache and upstream metrics reports)
-=======
->>>>>>> 1accccec (Create dedicated cache and upstream metrics reports)
-	if len(m.WafVersion) > 0 {
-		dAtA[i] = 0xa
-		i++
-		i = encodeVarintNap(dAtA, i, uint64(len(m.WafVersion)))
-		i += copy(dAtA[i:], m.WafVersion)
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
->>>>>>> b0c49853 (Create dedicated cache and upstream metrics reports)
-	}
-	if len(m.AttackSignaturesVersion) > 0 {
-		dAtA[i] = 0x12
-		i++
-		i = encodeVarintNap(dAtA, i, uint64(len(m.AttackSignaturesVersion)))
-		i += copy(dAtA[i:], m.AttackSignaturesVersion)
-	}
-	if len(m.ThreatCampaignsVersion) > 0 {
-		dAtA[i] = 0x1a
-		i++
-		i = encodeVarintNap(dAtA, i, uint64(len(m.ThreatCampaignsVersion)))
-		i += copy(dAtA[i:], m.ThreatCampaignsVersion)
-=======
-	if m.XXX_unrecognized != nil {
-		i -= len(m.XXX_unrecognized)
-		copy(dAtA[i:], m.XXX_unrecognized)
->>>>>>> 29a5bd11 (adds updated generated files from protobuf)
-	}
-	if m.Health != nil {
-		{
-			size, err := m.Health.MarshalToSizedBuffer(dAtA[:i])
-			if err != nil {
-				return 0, err
-			}
-			i -= size
-			i = encodeVarintNap(dAtA, i, uint64(size))
-		}
-		i--
-		dAtA[i] = 0x22
-	}
-	if len(m.ThreatCampaignsVersion) > 0 {
-		i -= len(m.ThreatCampaignsVersion)
-		copy(dAtA[i:], m.ThreatCampaignsVersion)
-		i = encodeVarintNap(dAtA, i, uint64(len(m.ThreatCampaignsVersion)))
-		i--
-		dAtA[i] = 0x1a
-=======
->>>>>>> aeb0dc74 (Create dedicated cache and upstream metrics reports)
-	}
-	if len(m.AttackSignaturesVersion) > 0 {
-		dAtA[i] = 0x12
-		i++
-		i = encodeVarintNap(dAtA, i, uint64(len(m.AttackSignaturesVersion)))
-		i += copy(dAtA[i:], m.AttackSignaturesVersion)
-	}
-	if len(m.ThreatCampaignsVersion) > 0 {
-		dAtA[i] = 0x1a
-		i++
-		i = encodeVarintNap(dAtA, i, uint64(len(m.ThreatCampaignsVersion)))
-		i += copy(dAtA[i:], m.ThreatCampaignsVersion)
-=======
-	if m.XXX_unrecognized != nil {
-		i -= len(m.XXX_unrecognized)
-		copy(dAtA[i:], m.XXX_unrecognized)
->>>>>>> 4e412375 (adds updated generated files from protobuf)
-	}
-	if m.Health != nil {
-		{
-			size, err := m.Health.MarshalToSizedBuffer(dAtA[:i])
-			if err != nil {
-				return 0, err
-			}
-			i -= size
-			i = encodeVarintNap(dAtA, i, uint64(size))
-		}
-		i--
-		dAtA[i] = 0x22
-	}
-	if len(m.ThreatCampaignsVersion) > 0 {
-		i -= len(m.ThreatCampaignsVersion)
-		copy(dAtA[i:], m.ThreatCampaignsVersion)
-		i = encodeVarintNap(dAtA, i, uint64(len(m.ThreatCampaignsVersion)))
-		i--
-		dAtA[i] = 0x1a
-=======
->>>>>>> b1c864fb (Create dedicated cache and upstream metrics reports)
-	}
-	if len(m.AttackSignaturesVersion) > 0 {
-		dAtA[i] = 0x12
-		i++
-		i = encodeVarintNap(dAtA, i, uint64(len(m.AttackSignaturesVersion)))
-		i += copy(dAtA[i:], m.AttackSignaturesVersion)
-	}
-	if len(m.ThreatCampaignsVersion) > 0 {
-		dAtA[i] = 0x1a
-		i++
-		i = encodeVarintNap(dAtA, i, uint64(len(m.ThreatCampaignsVersion)))
-		i += copy(dAtA[i:], m.ThreatCampaignsVersion)
-=======
-	if m.XXX_unrecognized != nil {
-		i -= len(m.XXX_unrecognized)
-		copy(dAtA[i:], m.XXX_unrecognized)
->>>>>>> 032649b5 (adds updated generated files from protobuf)
-	}
-	if m.Health != nil {
-		{
-			size, err := m.Health.MarshalToSizedBuffer(dAtA[:i])
-			if err != nil {
-				return 0, err
-			}
-			i -= size
-			i = encodeVarintNap(dAtA, i, uint64(size))
-		}
-		i--
-		dAtA[i] = 0x22
-	}
-	if len(m.ThreatCampaignsVersion) > 0 {
-		i -= len(m.ThreatCampaignsVersion)
-		copy(dAtA[i:], m.ThreatCampaignsVersion)
-		i = encodeVarintNap(dAtA, i, uint64(len(m.ThreatCampaignsVersion)))
-		i--
-		dAtA[i] = 0x1a
-=======
->>>>>>> 1accccec (Create dedicated cache and upstream metrics reports)
-	}
-	if len(m.AttackSignaturesVersion) > 0 {
-		dAtA[i] = 0x12
-		i++
-		i = encodeVarintNap(dAtA, i, uint64(len(m.AttackSignaturesVersion)))
-		i += copy(dAtA[i:], m.AttackSignaturesVersion)
-	}
-	if len(m.ThreatCampaignsVersion) > 0 {
-		dAtA[i] = 0x1a
-		i++
-		i = encodeVarintNap(dAtA, i, uint64(len(m.ThreatCampaignsVersion)))
-		i += copy(dAtA[i:], m.ThreatCampaignsVersion)
-=======
-	if m.XXX_unrecognized != nil {
-		i -= len(m.XXX_unrecognized)
-		copy(dAtA[i:], m.XXX_unrecognized)
->>>>>>> 506308d4 (adds updated generated files from protobuf)
-	}
-	if m.Health != nil {
-		{
-			size, err := m.Health.MarshalToSizedBuffer(dAtA[:i])
-			if err != nil {
-				return 0, err
-			}
-			i -= size
-			i = encodeVarintNap(dAtA, i, uint64(size))
-		}
-		i--
-		dAtA[i] = 0x22
-	}
-	if len(m.ThreatCampaignsVersion) > 0 {
-		i -= len(m.ThreatCampaignsVersion)
-		copy(dAtA[i:], m.ThreatCampaignsVersion)
-		i = encodeVarintNap(dAtA, i, uint64(len(m.ThreatCampaignsVersion)))
-		i--
-		dAtA[i] = 0x1a
 	}
 	if len(m.AttackSignaturesVersion) > 0 {
 		i -= len(m.AttackSignaturesVersion)