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:   replicas: 1
    selector:
      matchLabels:
  <<<<<<< 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-machineset: <cluster_name>-<machine_label>-<AWS-availability-zone> <1>
    template:
      metadata:
        creationTimestamp: null
        labels:
  <<<<<<< HEAD
          machine.openshift.io/cluster-api-cluster: <cluster_name>
          machine.openshift.io/cluster-api-machine-role: <machine_label>
  =======
          machine.openshift.io/cluster-api-cluster: <infrastructure_id>
          machine.openshift.io/cluster-api-machine-role:  <machine_label>
  >>>>>>> bug 1689241 updating the machineset definition
          machine.openshift.io/cluster-api-machine-type: <machine_label>
          machine.openshift.io/cluster-api-machineset: <cluster_name>-<machine_label>-<AWS-availability-zone> <1>
  ...
  
negative.code:   creationTimestamp: 2019-02-15T16:32:56Z <1>
    generation: 1 <1>
    labels:
      machine.openshift.io/cluster-api-cluster:  <infrastructure_id> <2>
      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>
  