diff --git a/share/oneprovision/hybrid+/providers/aws/aws-eu-central-1.yml b/share/oneprovision/hybrid+/providers/aws/aws-eu-central-1.yml
index 0c1b8d2e47..597f708beb 100644
--- a/share/oneprovision/hybrid+/providers/aws/aws-eu-central-1.yml
+++ b/share/oneprovision/hybrid+/providers/aws/aws-eu-central-1.yml
@@ -1,7 +1,10 @@
 name: 'aws-frankfurt'
 description: 'Elastic cluster on AWS in Frakfurt'
+<<<<<<< HEAD
 
 provider: 'aws'
+=======
+>>>>>>> 9aba518d5 (F #3951: Add provision & provider to plain)
 
 plain:
   provision: 'hybrid+'
diff --git a/share/oneprovision/hybrid+/providers/packet/packet-amsterdam.yml b/share/oneprovision/hybrid+/providers/packet/packet-amsterdam.yml
index 410e5b77e7..f78c89ae91 100644
--- a/share/oneprovision/hybrid+/providers/packet/packet-amsterdam.yml
+++ b/share/oneprovision/hybrid+/providers/packet/packet-amsterdam.yml
@@ -1,7 +1,10 @@
 name: 'packet-amsterdam'
 description: 'Elastic cluster on Packet in Amsterdam'
+<<<<<<< HEAD
 
 provider: 'packet'
+=======
+>>>>>>> 9aba518d5 (F #3951: Add provision & provider to plain)
 
 plain:
   provision: 'hybrid+'