diff --git a/changelog.md b/changelog.md
index c80ceda..c728e12 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.0.4 - 2019-10-17
+
+* Enable Laravel 6.0 compatability
+
 ## 1.0.3 - 2019-02-11
 
 * Enable package discovery for laravel 5.5+ 
diff --git a/composer.json b/composer.json
index 9b648ec..2244ac6 100644
--- a/composer.json
+++ b/composer.json
@@ -10,9 +10,15 @@
   ],
   "require": {
     "php": ">=5.6.0",
+<<<<<<< HEAD
     "illuminate/support": "^4.0",
     "illuminate/routing": "^4.0",
     "jimdo/prometheus_client_php": "^0.9.1"
+=======
+    "illuminate/support": "^5.3 || ^6.0",
+    "illuminate/routing": "^5.3 || ^6.0",
+    "jimdo/prometheus_client_php": "^0.9.0"
+>>>>>>> c1cd48549fb5270120d4c529e6dad739383843fc
   },
   "autoload": {
     "psr-4": {