From f4338d6f756d15c0fe55e6e61b6867a5d5e3b354 Mon Sep 17 00:00:00 2001
From: Jae Kwon <jae@tendermint.com>
Date: Sun, 4 Nov 2018 19:42:11 -0800
Subject: [PATCH] Fix merge conflict bug; Update PENDING

---
 PENDING.md         | 2 +-
 store/iavlstore.go | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/PENDING.md b/PENDING.md
index 84a08a5abe..2c3c3cd1d9 100644
--- a/PENDING.md
+++ b/PENDING.md
@@ -12,7 +12,7 @@ BREAKING CHANGES
   * [simulation] \#2665 only argument to simulation.Invariant is now app
 
 * Tendermint
-
+  * Upgrade to version 0.26.0
 
 FEATURES
 
diff --git a/store/iavlstore.go b/store/iavlstore.go
index 3b127357d7..bb588f029b 100644
--- a/store/iavlstore.go
+++ b/store/iavlstore.go
@@ -220,7 +220,7 @@ func (st *iavlStore) Query(req abci.RequestQuery) (res abci.ResponseQuery) {
 		}
 
 		if req.Prove {
-			value, _, err := tree.GetVersionedWithProof(key, res.Height)
+			value, proof, err := tree.GetVersionedWithProof(key, res.Height)
 			if err != nil {
 				res.Log = err.Error()
 				break