resolve merge conflicts

src/Query/Compound/FunctionScoreQuery.php

@@ -65,16 +65,14 @@ class FunctionScoreQuery implements BuilderInterface
      */
     public function addFieldValueFactorFunction($field, $factor, $modifier = 'none', BuilderInterface $query = null, $missing = null)
     {
-        $function = array_filter([
-            'field_value_factor' => [
+        $function = [
+            'field_value_factor' => array_filter([
                 'field' => $field,
                 'factor' => $factor,
                 'modifier' => $modifier,
                 'missing' => $missing
-            ],
-        ], function ($item) {
-            return $item !== null;
-        });
+            ]),
+        ];
 
         $this->applyFilter($function, $query);
 

src/Search.php

@@ -497,24 +497,6 @@ class Search
         return $this;
     }
 
-    /**
-     * @return bool
-     */
-    public function isTrackTotalHits()
-    {
-        return $this->trackTotalHits;
-    }
-
-    /**
-     * @param bool $trackTotalHits
-     * @return $this
-     */
-    public function setTrackTotalHits(bool $trackTotalHits)
-    {
-        $this->trackTotalHits = $trackTotalHits;
-        return $this;
-    }
-
     /**
      * @return int
      */