diff --git a/config/di-manager.yaml b/config/di-manager.yaml
index ae54c2504176d5edb91808d2db9586cc186160b5..b2580fec93599c915c9fd2c815e534d68e890003 100644
--- a/config/di-manager.yaml
+++ b/config/di-manager.yaml
@@ -15114,11 +15114,7 @@ spec:
                 description: Priority labels the priority of DIJob
                 type: string
               volumes:
-<<<<<<< HEAD
-                description: Volumes defines the shared volumes for nerveX components
-=======
-                description: Volumes defines the shared volumes for di components
->>>>>>> test-e2e
+                description: Volumes defines the shared volumes for DI-engine components
                 items:
                   description: Volume represents a named volume in a pod that may be accessed by any container in the pod.
                   properties:
@@ -16324,11 +16320,7 @@ spec:
         - --leader-elect
         command:
         - /di-operator
-<<<<<<< HEAD
-        image: registry.sensetime.com/cloudnative4ai/di-operator:v0.0.1-alpha.0
-=======
-        image: diorchestrator/di-operator:v0.1.0
->>>>>>> test-e2e
+        image: registry.sensetime.com/cloudnative4ai/di-operator:v0.2.0-alpha.0
         imagePullPolicy: Always
         livenessProbe:
           httpGet:
@@ -16392,11 +16384,7 @@ spec:
         - --lease-lock-name=di-server
         command:
         - /di-server
-<<<<<<< HEAD
-        image: registry.sensetime.com/cloudnative4ai/di-server:v0.0.1-alpha.0
-=======
-        image: diorchestrator/di-server:v0.1.0
->>>>>>> test-e2e
+        image: registry.sensetime.com/cloudnative4ai/di-server:v0.2.0-alpha.0
         imagePullPolicy: Always
         livenessProbe:
           httpGet: