diff --git a/roles/cluster/cluster_set_scale/tasks/main.yml b/roles/cluster/cluster_set_scale/tasks/main.yml
index dd3152177..2731da3c4 100644
--- a/roles/cluster/cluster_set_scale/tasks/main.yml
+++ b/roles/cluster/cluster_set_scale/tasks/main.yml
@@ -75,7 +75,11 @@
     set_fact:
       first_machineset: "{{ oc_get_machinesets.stdout_lines[0] }}"
 
+<<<<<<< HEAD
   - name: Set the replicas of the first {{ machineset_instance_type + 'machineset (' + first_machineset + ') to ' + scale | string }}
+=======
+  - name: Set the replicas of the first {{ machineset_instance_type + 'machineset (' + first_machineset + ') to ' + scale }}
+>>>>>>> 8c9be3ae (testing: lints partial fixes)
     command: >
       oc patch machineset -n openshift-machine-api {{ first_machineset }}
       --patch '{"spec": {"replicas": {{ scale }} }}' --type merge