From 505688dfb97d52ec70ed598ba87f643642648ff2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Marie=20Lamodi=C3=A8re?=
 <JMLamodiere@users.noreply.github.com>
Date: Wed, 12 Apr 2017 23:00:36 +0200
Subject: [PATCH] fix: conflict when merging timeout param (#562)

Closes #561
---
 src/Elasticsearch/Connections/Connection.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Elasticsearch/Connections/Connection.php b/src/Elasticsearch/Connections/Connection.php
index f8aa71a69..2c11196f2 100644
--- a/src/Elasticsearch/Connections/Connection.php
+++ b/src/Elasticsearch/Connections/Connection.php
@@ -160,7 +160,7 @@ public function performRequest($method, $uri, $params = null, $body = null, $opt
             ], $this->headers)
         ];
 
-        $request = array_merge_recursive($request, $this->connectionParams, $options);
+        $request = array_replace_recursive($request, $this->connectionParams, $options);
 
         // RingPHP does not like if client is empty
         if (empty($request['client'])) {