fix rebase conflict

Author: tiffanny29631

go.mod

@@ -32,7 +32,6 @@ require (
 	github.com/spf13/cobra v1.10.1
 	github.com/spyzhov/ajson v0.9.6
 	github.com/stretchr/testify v1.11.1
-	go.opencensus.io v0.24.0
 	go.opentelemetry.io/otel v1.38.0
 	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.38.0
 	go.opentelemetry.io/otel/metric v1.38.0
@@ -150,6 +149,7 @@ require (
 	github.com/vbatts/tar-split v0.12.1 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
 	github.com/xlab/treeprint v1.2.0 // indirect
+	go.opencensus.io v0.24.0 // indirect
 	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect

pkg/applier/applier_test.go

@@ -767,8 +767,8 @@ For more information, see https://g.co/cloud/acm-errors#knv2009`,
 
 	// process skipped apply of testObj1 (ignore-mutation object)
 	applyErr := &filter.AnnotationPreventedUpdateError{
-		Annotation: metadata.LifecycleMutationAnnotation,
-		Value:      metadata.IgnoreMutation,
+		Annotation: common.LifecycleMutationAnnotation,
+		Value:      common.IgnoreMutation,
 	}
 	// inject expected config sync metadata to verify it's set by applier
 	applyObj := testObj1.DeepCopy()