diff --git a/utils/hints.go b/utils/hints.go
index b4296cc38..097f44c6b 100644
--- a/utils/hints.go
+++ b/utils/hints.go
@@ -271,7 +271,6 @@ func GenerateHints(annotations mapstr.M, container, prefix string, allSupportedH
 								if err != nil {
 									continue
 								}
-
 							}
 						}
 					}
@@ -348,6 +347,7 @@ func checkSupportedHints(actualannotation string, allSupportedHints []string, st
 	return found
 }
 
+// checkSupportedHintsSets gest the data_streams or metricset lists that are defined. Searches inside specific hints of those lists and returns the unsupported list of hints found
 func checkSupportedHintsSets(annotations mapstr.M, key, prefix, actualannotation string, streamlist, allSupportedHints, incorrecthints []string) []string {
 	found := false
 	for _, streams := range streamlist {
diff --git a/utils/hints_test.go b/utils/hints_test.go
index fd1df080d..1cce2906e 100644
--- a/utils/hints_test.go
+++ b/utils/hints_test.go
@@ -51,11 +51,7 @@ func TestGetProcessors(t *testing.T) {
 
 func TestGenerateHints(t *testing.T) {
 
-<<<<<<< HEAD
 	var allSupportedHints = []string{"enabled", "package", "module", "integration", "data_streams", "metricsets", "host", "period", "timeout", "metrics_path", "username", "password", "stream", "processors", "multiline", "json", "disable"}
-=======
-	var allSupportedHints = []string{"enabled", "module", "integration", "datas_treams", "host", "period", "timeout", "metrics_path", "username", "password", "stream", "processors", "multiline", "json", "disable"}
->>>>>>> 7490558445cb8d3248462255edc8ac64bc18b8eb
 
 	tests := []struct {
 		name                   string