diff --git a/pkg/controller/v1alpha2/applicationconfiguration/render_test.go b/pkg/controller/v1alpha2/applicationconfiguration/render_test.go
index e8dda9a2..9fd690b1 100644
--- a/pkg/controller/v1alpha2/applicationconfiguration/render_test.go
+++ b/pkg/controller/v1alpha2/applicationconfiguration/render_test.go
@@ -910,7 +910,6 @@ func TestGetComponent(t *testing.T) {
 	}, c)
 }
 
-<<<<<<< HEAD
 var scheme = runtime.NewScheme()
 
 func TestRenderTraitName(t *testing.T) {
@@ -1017,8 +1016,8 @@ func TestRenderTraitName(t *testing.T) {
 	traitName, err := r.getTraitName(context.Background(), namespace, componentName, &ac.Spec.Components[0].Traits[0], ref, &data)
 	assert.NoError(t, err)
 	assert.Equal(t, traitName, "component-trait-11111111")
+}
 
-=======
 func TestPassThroughObjMeta(t *testing.T) {
 	c := components{}
 	ac := &v1alpha2.ApplicationConfiguration{}
@@ -1089,5 +1088,4 @@ func TestPassThroughObjMeta(t *testing.T) {
 			t.Errorf("labels got:%v,want:%v", gotLabels, wantLabels)
 		}
 	})
->>>>>>> upstream/master
 }