diff --git a/changelog.md b/changelog.md
index c728e12..c600f9a 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.0.5 - 2020-03-16
+
+* Update call to array_get helper to use the Illuminate\Support\Arr class
+* Enable Laravel 7 compatability
+
 ## 1.0.4 - 2019-10-17
 
 * Enable Laravel 6.0 compatability
diff --git a/composer.json b/composer.json
index 2244ac6..9b648ec 100644
--- a/composer.json
+++ b/composer.json
@@ -10,15 +10,9 @@
   ],
   "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": {
diff --git a/src/PrometheusServiceProvider.php b/src/PrometheusServiceProvider.php
index 1843a8e..f3a4705 100644
--- a/src/PrometheusServiceProvider.php
+++ b/src/PrometheusServiceProvider.php
@@ -2,6 +2,7 @@
 
 namespace Superbalist\LaravelPrometheusExporter;
 
+use Illuminate\Support\Arr;
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Support\Arr;
 use Prometheus\CollectorRegistry;
@@ -51,7 +52,7 @@ class PrometheusServiceProvider extends ServiceProvider
             $factory = $app['prometheus.storage_adapter_factory']; /** @var StorageAdapterFactory $factory */
             $driver = config('prometheus.storage_adapter');
             $configs = config('prometheus.storage_adapters');
-            $config = array_get($configs, $driver, []);
+            $config = Arr::get($configs, $driver, []);
             return $factory->make($driver, $config);
         });
         $this->app->alias(Adapter::class, 'prometheus.storage_adapter');