diff --git a/README.md b/README.md
index 2a63098..b90d9bd 100644
--- a/README.md
+++ b/README.md
@@ -607,4 +607,7 @@ shared-<NODE_NAME>-workload            61m
 `kubectl delete pods <name>`
 
 When a Pod that was associated with a PowerWorkload is deleted, the cores associated with that Pod will be removed from the corresponding PowerWorkload. If that Pod was the last requesting the use of that PowerWorkload, the workload will be deleted. All cores removed from the PowerWorkload are added back to the Shared PowerWorkload for that Node and returned to the lower frequencies.
+<<<<<<< HEAD
 
+=======
+>>>>>>> external/master
diff --git a/build/manifests/power-node-agent-ds.yaml b/build/manifests/power-node-agent-ds.yaml
index 34bc039..466c047 100644
--- a/build/manifests/power-node-agent-ds.yaml
+++ b/build/manifests/power-node-agent-ds.yaml
@@ -34,7 +34,7 @@ spec:
               memory: 30Mi
           volumeMounts:
             - mountPath: /sys/devices/system/cpu
-              name: CPUsetup
+              name: cpusetup
             - mountPath: /sys/fs
               name: cgroup
               readOnly: true
@@ -42,7 +42,7 @@ spec:
               name: kubesock
               readOnly: true
       volumes:
-        - name: CPUsetup
+        - name: cpusetup
           hostPath:
             path: /sys/devices/system/cpu
         - name: cgroup