fixed weird formatting

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

pkg/kubecost/allocationprops_test.go

@@ -12,15 +12,7 @@ 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"},
@@ -28,18 +20,13 @@ func TestGenerateKey(t *testing.T) {
 			},
 			expected: "test owner 123",
 		},
-<<<<<<< HEAD
 		"aggregate by owner without labels": {
-=======
-		"agg by owner without labels": {
->>>>>>> Recognizes annotations when aggregating by owner
 			aggregate: []string{"owner"},
 			allocationProps: &AllocationProperties{
 				Annotations: map[string]string{"owner": "test owner 123"},
 			},
 			expected: "test owner 123",
 		},
-<<<<<<< HEAD
 		"aggregate by owner with owner label and annotation": {
 			aggregate: []string{"owner"},
 			allocationProps: &AllocationProperties{
@@ -88,8 +75,6 @@ func TestGenerateKey(t *testing.T) {
 			},
 			expected: "product-label/owner-label",
 		},
-=======
->>>>>>> Recognizes annotations when aggregating by owner
 	}
 
 	for name, tc := range cases {