Merge branch '7.0' into 7.1

* 7.0:
  fix merge

Author: xabbuh

src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/RedisExtIntegrationTest.php

@@ -381,19 +381,11 @@ public function testGetAfterReject()
             $failing = $connection->get();
             $connection->reject($failing['id']);
 
-<<<<<<< HEAD
-        $connection = Connection::fromDsn('redis://localhost/messenger-rejectthenget', ['sentinel_master' => null]);
-
-        $this->assertNotNull($connection->get());
-
-        $redis->del('messenger-rejectthenget');
-=======
-            $connection = Connection::fromDsn('redis://localhost/messenger-rejectthenget', ['delete_after_ack' => true]);
+            $connection = Connection::fromDsn('redis://localhost/messenger-rejectthenget', ['sentinel_master' => null]);
             $this->assertNotNull($connection->get());
         } finally {
             $redis->del('messenger-rejectthenget');
         }
->>>>>>> 5.4
     }
 
     public function testItProperlyHandlesEmptyMessages()