fix merge conflict

Author: yooper

composer.json

@@ -20,19 +20,19 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.0.x-dev"
+            "dev-master": "1.3.x-dev"
         }
     },
     "require" : {
         "php": ">=7.0",
-        "yooper/stop-words": "^1.0",
-        "symfony/console": ">=2.7",
-        "camspiers/porter-stemmer": "1.0.*",
-        "wamania/php-stemmer": "1.2",
-        "yooper/nicknames": "1.0.1"
+        "yooper/stop-words": "~1",
+        "symfony/console": "~2.7",
+        "camspiers/porter-stemmer": "~1",
+        "wamania/php-stemmer": "~1",
+        "yooper/nicknames": "~1"
     },
     "require-dev": {
-        "phpunit/phpunit": "5.*",
-        "mockery/mockery" : "1.0"
+        "phpunit/phpunit": "~5",
+        "mockery/mockery" : "~1.0"
     }
 }