anchor.diff:  ----
   metadata:
     labels:
  +<<<<<<< HEAD
       machine.openshift.io/cluster-api-cluster: <cluster_name>
  +=======
  +    machine.openshift.io/cluster-api-cluster: <infrastructure_id>
  +>>>>>>> bug 1689241 updating the machineset definition
       machine.openshift.io/cluster-api-machine-role: <new_machine_label>
       machine.openshift.io/cluster-api-machine-type: <new_machine_label>
     name: <cluster_name>-<new_machine_label>-<AWS-availability-zone>
  
positive.code:         iops: 0
          volumeSize: 120
          volumeType: gp2
      deviceIndex: 0
      iamInstanceProfile: <3>
        id: <cluster_name>-<machine_label>-profile
      instanceType: m4.large <4>
      kind: AWSMachineProviderConfig
      metadata:
  
negative.code:   creationTimestamp: 2019-02-15T16:32:56Z <1>
    generation: 1 <1>
    labels:
  <<<<<<< HEAD
      machine.openshift.io/cluster-api-cluster: <cluster_name> <2>
  =======
      machine.openshift.io/cluster-api-cluster:  <infrastructure_id> <2>
  >>>>>>> bug 1689241 updating the machineset definition
      machine.openshift.io/cluster-api-machine-role: <machine_label> <3>
      machine.openshift.io/cluster-api-machine-type: <machine_label> <3>
    name: <cluster_name>-<machine_label>-<AWS-availability-zone> <3> <4>
    namespace: openshift-machine-api
    resourceVersion: "9249" <1>
    selfLink: /apis/machine.openshift.io/v1beta1/namespaces/openshift-machine-api/machinesets/ <infrastructure_id>-<machine_label>-<AWS-availability-zone> <1>
    uid: 59ba0425-313f-11e9-861e-0a18047f0a28 <1>
  ----
  <1> Remove this line.
  <2> Do not change the `<infrastructure_id>`.
  <3> For each `<machine_label>` instance, specify the name of the new MachineSet.
  <4> Ensure that the AWS availability zone is correct in each instance of the
  `<AWS-availability-zone>` parameter.
  