diff --git a/src/StorageDrivers/RedisStorageDriver.php b/src/StorageDrivers/RedisStorageDriver.php
index 57b2b1f7..3241a9ba 100644
--- a/src/StorageDrivers/RedisStorageDriver.php
+++ b/src/StorageDrivers/RedisStorageDriver.php
@@ -81,10 +81,6 @@ class RedisStorageDriver implements StorageDriver
                 $tenant = substr($tenant, strlen($redis_prefix));
             }
 
-<<<<<<< HEAD
-        return \array_map(function ($tenant) {
-=======
->>>>>>> 1.x
             return $this->redis->hgetall($tenant);
         }, $hashes);
     }