diff --git a/composer.json b/composer.json
index 3c17ed89da..b4a5afbccf 100644
--- a/composer.json
+++ b/composer.json
@@ -26,6 +26,7 @@
         }
     },
     "require": {
+<<<<<<< HEAD
         "php": ">=5.5.0",
         "ext-mbstring": "*",
         "ext-xml": "*",
@@ -47,8 +48,8 @@
         "phpunit/phpunit": "~4.1",
         "codacy/coverage": "dev-master",
         "phpunit/phpunit-selenium": "~1.2",
-        "phpmyadmin/coding-standard": ">=0.1.0",
-        "squizlabs/php_codesniffer": "2.*"
+        "squizlabs/php_codesniffer": "2.*",
+        "phpmyadmin/coding-standard": ">=0.1.0"
     },
     "repositories": [
         {