diff --git a/tests/Unit/Query/Compound/BoolQueryTest.php b/tests/Unit/Query/Compound/BoolQueryTest.php
index 75f54e16..959ca075 100644
--- a/tests/Unit/Query/Compound/BoolQueryTest.php
+++ b/tests/Unit/Query/Compound/BoolQueryTest.php
@@ -83,13 +83,8 @@ public function testBoolConstructor()
      */
     public function testBoolConstructorException()
     {
-<<<<<<< HEAD
-        $this->expectExceptionMessage("The bool operator acme is not supported");
-        $this->expectException(\UnexpectedValueException::class);
-=======
         $this->expectException(\UnexpectedValueException::class);
         $this->expectExceptionMessage('The bool operator acme is not supported');
->>>>>>> 6c412555354f92407045a93b42c393bfb49fb0fa
         new BoolQuery([
             'acme' => [new TermQuery('key1', 'value1')],
         ]);