diff --git a/templates.json b/templates.json
index 694530a..f2afc40 100644
--- a/templates.json
+++ b/templates.json
@@ -159,7 +159,6 @@
     "volumes": ["/usr/share/elasticsearch/data"]
   },
   {
-<<<<<<< HEAD
     "title": "Minio",
     "description": "A distributed object storage server built for cloud applications and devops",
     "categories": ["storage"],
@@ -204,9 +203,11 @@
     ],
     "volumes": ["/usr/src/app/localData", "/usr/src/app/localMetadata"]
   },
-=======
+  {
     "title": "SQL Server",
     "description": "Microsoft SQL Server on Linux",
+    "categories": ["database"],
+    "platform": "linux",
     "note": "Password needs to include at least 8 characters including uppercase, lowercase letters, base-10 digits and/or non-alphanumeric symbols.",
     "logo": "https://cloudinovasi.id/assets/img/logos/microsoft.png",
     "image": "microsoft/mssql-server-linux:latest",
@@ -227,6 +228,8 @@
   {
     "title": "SQL Server",
     "description": "Microsoft SQL Server for Windows containers",
+    "categories": ["database"],
+    "platform": "linux",
     "note": "Password needs to include at least 8 characters including uppercase, lowercase letters, base-10 digits and/or non-alphanumeric symbols.",
     "logo": "https://cloudinovasi.id/assets/img/logos/microsoft.png",
     "image": "microsoft/mssql-server-windows:latest",
@@ -248,6 +251,8 @@
   {
     "title": "SQL Server Express",
     "description": "Microsoft SQL Server Express for Windows containers",
+    "categories": ["database"],
+    "platform": "linux",
     "note": "Password needs to include at least 8 characters including uppercase, lowercase letters, base-10 digits and/or non-alphanumeric symbols.",
     "logo": "https://cloudinovasi.id/assets/img/logos/microsoft.png",
     "image": "microsoft/mssql-server-windows-express:latest",
@@ -267,27 +272,26 @@
     "volumes": ["C:/temp/"]
   },
   {
-   "title": "Minio",
-   "description": "A distributed object storage server built for cloud applications and devops",
-   "logo": "https://cloudinovasi.id/assets/img/logos/minio.png",
-   "image": "minio/minio:latest",
-   "ports": [
-     "9000/tcp"
-   ],
-   "env": [
-     {
-       "name": "MINIO_ACCESS_KEY",
-       "label": "Minio access key"
-     },
-     {
-       "name": "MINIO_SECRET_KEY",
-       "label": "Minio secret key"
-     }
-   ],
-   "volumes": ["/export", "/root/.minio"],
-   "command": "server /export"
- },
->>>>>>> templates-microsoft
+    "title": "Minio",
+    "description": "A distributed object storage server built for cloud applications and devops",
+    "logo": "https://cloudinovasi.id/assets/img/logos/minio.png",
+    "image": "minio/minio:latest",
+    "ports": [
+      "9000/tcp"
+    ],
+    "env": [
+      {
+        "name": "MINIO_ACCESS_KEY",
+        "label": "Minio access key"
+      },
+      {
+        "name": "MINIO_SECRET_KEY",
+        "label": "Minio secret key"
+      }
+    ],
+    "volumes": ["/export", "/root/.minio"],
+    "command": "server /export"
+  },
   {
     "title": "Solr",
     "description": "Open-source enterprise search platform",