diff --git a/pkg/controller/resolvedofferings/testdata/volumeclass/volume-class-defaults-same-gen/expected.golden b/pkg/controller/resolvedofferings/testdata/volumeclass/volume-class-defaults-same-gen/expected.golden
index 365f50fc11..146d84796a 100644
--- a/pkg/controller/resolvedofferings/testdata/volumeclass/volume-class-defaults-same-gen/expected.golden
+++ b/pkg/controller/resolvedofferings/testdata/volumeclass/volume-class-defaults-same-gen/expected.golden
@@ -30,14 +30,6 @@ status:
   appStatus: {}
   columns: {}
   conditions:
-<<<<<<< HEAD:pkg/controller/defaults/testdata/volumeclass/volume-class-defaults-same-gen/expected.golden
-    observedGeneration: 1
-    reason: Success
-    status: "True"
-    success: true
-    type: defaults
-  defaults: {}
-=======
   - error: true
     message: 'cannot resolve volume classes because two defaults volume classes exist:
       test-volume-class and test-volume-class-1'
@@ -45,7 +37,6 @@ status:
     reason: Error
     status: "False"
     type: resolved-offerings
->>>>>>> d06e0189c (Refactor defaults to resolvedOfferings):pkg/controller/resolvedofferings/testdata/volumeclass/volume-class-defaults-same-gen/expected.golden
   namespace: app-created-namespace
   observedGeneration: 1
   resolvedOfferings: {}