fixed test case wording

Signed-off-by: nickcurie <nick.curie64@gmail.com>

pkg/kubecost/allocationprops_test.go

@@ -12,11 +12,15 @@ func TestGenerateKey(t *testing.T) {
 		allocationProps *AllocationProperties
 		expected        string
 	}{
+<<<<<<< HEAD
 <<<<<<< HEAD
 		"aggregateregate by owner without owner labels": {
 =======
 		"agg by owner with labels": {
 >>>>>>> Recognizes annotations when aggregating by owner
+=======
+		"aggregate by owner without owner labels": {
+>>>>>>> fixed test case wording
 			aggregate: []string{"owner"},
 			allocationProps: &AllocationProperties{
 				Labels:      map[string]string{"app": "cost-analyzer"},