diff --git a/BMW-Dynatrace-config/00_Global-Config/auto-tag/Component.json b/BMW-Dynatrace-config/00_Global-Config/auto-tag/Component.json
index e0cb062e..13e922c9 100644
--- a/BMW-Dynatrace-config/00_Global-Config/auto-tag/Component.json
+++ b/BMW-Dynatrace-config/00_Global-Config/auto-tag/Component.json
@@ -4513,12 +4513,15 @@
        "type": "STATIC"
       }
      }
-<<<<<<< HEAD
-    ]
+    ],
+    "enabled": true,
+    "propagationTypes": [],
+    "type": "SERVICE",
+    "valueFormat": "VPS-Admin"
    },
    {
-    "type": "SERVICE",
     "enabled": true,
+    "type": "SERVICE",
     "valueFormat": "msgsvc",
     "propagationTypes": [],
     "conditions": [
@@ -4546,13 +4549,37 @@
       }
      }
     ]
-=======
-    ],
+   },
+   {
     "enabled": true,
-    "propagationTypes": [],
     "type": "SERVICE",
-    "valueFormat": "VPS-Admin"
->>>>>>> 9185efc6d986c7d7f7546667d2c36279c3db0e6c
+    "valueFormat": "vps-va-joynr",
+    "propagationTypes": [],
+    "conditions": [
+     {
+      "key": {
+       "attribute": "SERVICE_TYPE"
+      },
+      "comparisonInfo": {
+       "type": "SERVICE_TYPE",
+       "operator": "EQUALS",
+       "value": "DATABASE_SERVICE",
+       "negate": false
+      }
+     },
+     {
+      "key": {
+       "attribute": "SERVICE_DATABASE_NAME"
+      },
+      "comparisonInfo": {
+       "type": "STRING",
+       "operator": "CONTAINS",
+       "value": "vps-va-joynr_",
+       "negate": false,
+       "caseSensitive": true
+      }
+     }
+    ]
    }
   ]
  }
\ No newline at end of file