Merge branch 'add-conflict' into 'main'

Update composer.json

See merge request !2

composer.json

@@ -16,6 +16,9 @@
     },
     "require": {
         "phpstan/extension-installer": "*"
+    },
+    "conflict": {
+        "thunder/taas-assets": "*"
     }
 }