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 f74acc76..b93d7bd8 100644
--- a/BMW-Dynatrace-config/00_Global-Config/auto-tag/Component.json
+++ b/BMW-Dynatrace-config/00_Global-Config/auto-tag/Component.json
@@ -3946,11 +3946,7 @@
       "negate": false,
       "operator": "CONTAINS",
       "type": "STRING",
-<<<<<<< HEAD
-      "value": "sfa_fre"
-=======
       "value": "sfa_ts"
->>>>>>> b297e7444bc05ef8feb27cae1196d96e2c3b065d
      },
      "key": {
       "attribute": "SERVICE_DATABASE_NAME",
@@ -3961,7 +3957,39 @@
    "enabled": true,
    "propagationTypes": [],
    "type": "SERVICE",
-<<<<<<< HEAD
+   "valueFormat": "sfa-ts"
+  },
+  {
+   "conditions": [
+    {
+     "comparisonInfo": {
+      "negate": false,
+      "operator": "EQUALS",
+      "type": "SERVICE_TYPE",
+      "value": "DATABASE_SERVICE"
+     },
+     "key": {
+      "attribute": "SERVICE_TYPE",
+      "type": "STATIC"
+     }
+    },
+    {
+     "comparisonInfo": {
+      "caseSensitive": true,
+      "negate": false,
+      "operator": "CONTAINS",
+      "type": "STRING",
+      "value": "sfa_fre"
+     },
+     "key": {
+      "attribute": "SERVICE_DATABASE_NAME",
+      "type": "STATIC"
+     }
+    }
+   ],
+   "enabled": true,
+   "propagationTypes": [],
+   "type": "SERVICE",
    "valueFormat": "sfa-fre"
   },
   {
@@ -3996,9 +4024,6 @@
    "propagationTypes": [],
    "type": "SERVICE",
    "valueFormat": "asbc-sfa-oh"
-=======
-   "valueFormat": "sfa-ts"
->>>>>>> b297e7444bc05ef8feb27cae1196d96e2c3b065d
   }
  ]
-}
+}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/00_tmp/auto-tag/Component.json b/BMW-Dynatrace-config/00_tmp/auto-tag/Component.json
index df06f8a4..b93d7bd8 100644
--- a/BMW-Dynatrace-config/00_tmp/auto-tag/Component.json
+++ b/BMW-Dynatrace-config/00_tmp/auto-tag/Component.json
@@ -3925,6 +3925,105 @@
    "propagationTypes": [],
    "type": "SERVICE",
    "valueFormat": "sfa"
+  },
+  {
+   "conditions": [
+    {
+     "comparisonInfo": {
+      "negate": false,
+      "operator": "EQUALS",
+      "type": "SERVICE_TYPE",
+      "value": "DATABASE_SERVICE"
+     },
+     "key": {
+      "attribute": "SERVICE_TYPE",
+      "type": "STATIC"
+     }
+    },
+    {
+     "comparisonInfo": {
+      "caseSensitive": true,
+      "negate": false,
+      "operator": "CONTAINS",
+      "type": "STRING",
+      "value": "sfa_ts"
+     },
+     "key": {
+      "attribute": "SERVICE_DATABASE_NAME",
+      "type": "STATIC"
+     }
+    }
+   ],
+   "enabled": true,
+   "propagationTypes": [],
+   "type": "SERVICE",
+   "valueFormat": "sfa-ts"
+  },
+  {
+   "conditions": [
+    {
+     "comparisonInfo": {
+      "negate": false,
+      "operator": "EQUALS",
+      "type": "SERVICE_TYPE",
+      "value": "DATABASE_SERVICE"
+     },
+     "key": {
+      "attribute": "SERVICE_TYPE",
+      "type": "STATIC"
+     }
+    },
+    {
+     "comparisonInfo": {
+      "caseSensitive": true,
+      "negate": false,
+      "operator": "CONTAINS",
+      "type": "STRING",
+      "value": "sfa_fre"
+     },
+     "key": {
+      "attribute": "SERVICE_DATABASE_NAME",
+      "type": "STATIC"
+     }
+    }
+   ],
+   "enabled": true,
+   "propagationTypes": [],
+   "type": "SERVICE",
+   "valueFormat": "sfa-fre"
+  },
+  {
+   "conditions": [
+    {
+     "comparisonInfo": {
+      "negate": false,
+      "operator": "EQUALS",
+      "type": "SERVICE_TYPE",
+      "value": "DATABASE_SERVICE"
+     },
+     "key": {
+      "attribute": "SERVICE_TYPE",
+      "type": "STATIC"
+     }
+    },
+    {
+     "comparisonInfo": {
+      "caseSensitive": true,
+      "negate": false,
+      "operator": "CONTAINS",
+      "type": "STRING",
+      "value": "oh"
+     },
+     "key": {
+      "attribute": "SERVICE_DATABASE_NAME",
+      "type": "STATIC"
+     }
+    }
+   ],
+   "enabled": true,
+   "propagationTypes": [],
+   "type": "SERVICE",
+   "valueFormat": "asbc-sfa-oh"
   }
  ]
 }
\ No newline at end of file