Resolving merge conflicts

Author: BaDos

composer.json

@@ -26,8 +26,8 @@
       "@phpmd",
       "@phpunit"
     ],
-    "phpcs": "phpcs ./ --standard=Test/static/phpcs-ruleset.xml -p -n",
-    "phpmd": "phpmd Console xml Test/static/phpmd-ruleset.xml",
+    "phpcs": "phpcs ./ --standard=test/static/phpcs-ruleset.xml -p -n",
+    "phpmd": "phpmd Console xml test/static/phpmd-ruleset.xml",
     "phpunit": "phpunit --configuration Test/Unit",
     "pre-install-cmd": "@install_suggested",
     "pre-update-cmd": "@install_suggested",