diff --git a/resources/fetching/fetchers/k8s/kube_fetcher_test.go b/resources/fetching/fetchers/k8s/kube_fetcher_test.go
index c51d925ee1..5f757f0271 100644
--- a/resources/fetching/fetchers/k8s/kube_fetcher_test.go
+++ b/resources/fetching/fetchers/k8s/kube_fetcher_test.go
@@ -24,11 +24,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/suite"
-<<<<<<< HEAD:resources/fetching/fetchers/k8s/kube_fetcher_test.go
 	v1 "k8s.io/api/core/v1"
-=======
-	"k8s.io/api/core/v1"
->>>>>>> 0029a1ad (Upgrade helm to v3.14.2 (#2356)):internal/resources/fetching/fetchers/k8s/kube_fetcher_test.go
 	rbacv1 "k8s.io/api/rbac/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
diff --git a/resources/fetching/fetchers/k8s/kube_provider.go b/resources/fetching/fetchers/k8s/kube_provider.go
index 69df3c570e..316f579617 100644
--- a/resources/fetching/fetchers/k8s/kube_provider.go
+++ b/resources/fetching/fetchers/k8s/kube_provider.go
@@ -118,11 +118,6 @@ func nullifyManagedFields(resource interface{}) {
 		val.ManagedFields = nil
 	case *kubernetes.ClusterRoleBinding:
 		val.ManagedFields = nil
-<<<<<<< HEAD:resources/fetching/fetchers/k8s/kube_provider.go
-	case *kubernetes.PodSecurityPolicy:
-		val.ManagedFields = nil
-=======
->>>>>>> 0029a1ad (Upgrade helm to v3.14.2 (#2356)):internal/resources/fetching/fetchers/k8s/kube_provider.go
 	case *kubernetes.ServiceAccount:
 		val.ManagedFields = nil
 	case *kubernetes.NetworkPolicy:
diff --git a/tests/product/tests/data/k8s_object/eks_k8s_object_test_cases.py b/tests/product/tests/data/k8s_object/eks_k8s_object_test_cases.py
index b222134af9..966d69092e 100644
--- a/tests/product/tests/data/k8s_object/eks_k8s_object_test_cases.py
+++ b/tests/product/tests/data/k8s_object/eks_k8s_object_test_cases.py
@@ -3,13 +3,10 @@
 Cases are organized as rules.
 Each rule has one or more test cases.
 """
-<<<<<<< HEAD:tests/product/tests/data/k8s_object/eks_k8s_object_test_cases.py
-=======
 
-# from commonlib.framework.reporting import SkipReportData, skip_param_case
->>>>>>> 0029a1ad (Upgrade helm to v3.14.2 (#2356)):tests/product/tests/data/eks/eks_k8s_object_test_cases.py
 from configuration import eks
-from commonlib.framework.reporting import skip_param_case, SkipReportData
+
+# from commonlib.framework.reporting import skip_param_case, SkipReportData
 from ..eks_test_case import EksKubeObjectCase
 from ..constants import RULE_PASS_STATUS, RULE_FAIL_STATUS