resolved conflict

Author: MaestroError

tests/Feature/EloquentRegexTest.php

@@ -663,4 +663,4 @@
         '/container/1234?city=berlin',
         '/container/2555?city=tbilisi'
     ]);
-});
+});