diff --git a/PENDING.md b/PENDING.md
index eb50d515e20d..635decd7ffb4 100644
--- a/PENDING.md
+++ b/PENDING.md
@@ -5,7 +5,20 @@ BREAKING CHANGES
 * Update to tendermint v0.23.0. This involves removing crypto.Pubkey,
 maintaining a validator address to pubkey map, and using time.Time instead of int64 for time. [SDK PR](https://github.com/cosmos/cosmos-sdk/pull/1927)
 
+<<<<<<< HEAD
 ## PENDING
+=======
+* Gaia REST API (`gaiacli advanced rest-server`)
+
+* Gaia CLI  (`gaiacli`)
+
+* Gaia
+    * Make the transient store key use a distinct store key.
+    
+* SDK 
+
+* Tendermint 
+>>>>>>> 0d41026a... Rename transient store key to be a unique key.
 
 BREAKING CHANGES
 * API
diff --git a/cmd/gaia/app/app.go b/cmd/gaia/app/app.go
index 9b318c8b17b0..a96efa6b174f 100644
--- a/cmd/gaia/app/app.go
+++ b/cmd/gaia/app/app.go
@@ -78,7 +78,7 @@ func NewGaiaApp(logger log.Logger, db dbm.DB, traceStore io.Writer, baseAppOptio
 		keyGov:           sdk.NewKVStoreKey("gov"),
 		keyFeeCollection: sdk.NewKVStoreKey("fee"),
 		keyParams:        sdk.NewKVStoreKey("params"),
-		tkeyParams:       sdk.NewTransientStoreKey("params"),
+		tkeyParams:       sdk.NewTransientStoreKey("transient_params"),
 	}
 
 	// define the accountMapper