diff --git a/CHANGELOG.md b/CHANGELOG.md
index 196e70fb806e..e71592e32859 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -53,7 +53,19 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ### Improvements
 
+<<<<<<< HEAD
 * (store) [\#10040](https://github.com/cosmos/cosmos-sdk/pull/10040) Bump IAVL to v0.17.1 which includes performance improvements on a batch load.
+=======
+* [\#10327](https://github.com/cosmos/cosmos-sdk/pull/10327) Add null guard for possible nil `Amount` in tx fee `Coins`
+* [\#9780](https://github.com/cosmos/cosmos-sdk/pull/9780) Remove gogoproto `moretags` YAML annotations and add `sigs.k8s.io/yaml` for YAML marshalling.
+* (x/bank) [\#10134](https://github.com/cosmos/cosmos-sdk/pull/10134) Add `HasDenomMetadata` function to bank `Keeper` to check if a client coin denom metadata exists in state.
+* (store) [\#10026](https://github.com/cosmos/cosmos-sdk/pull/10026) Improve CacheKVStore datastructures / algorithms, to no longer take O(N^2) time when interleaving iterators and insertions.
+* (types) [\#10076](https://github.com/cosmos/cosmos-sdk/pull/10076) Significantly speedup and lower allocations for `Coins.String()`.
+* (x/bank) [\#10022](https://github.com/cosmos/cosmos-sdk/pull/10022) `BankKeeper.SendCoins` now takes less execution time.
+* (deps) [\#9987](https://github.com/cosmos/cosmos-sdk/pull/9987) Bump Go version minimum requirement to `1.17`
+* (deps) [\#9956](https://github.com/cosmos/cosmos-sdk/pull/9956) Bump Tendermint to [v0.34.12](https://github.com/tendermint/tendermint/releases/tag/v0.34.12).
+* (cli) [\#9856](https://github.com/cosmos/cosmos-sdk/pull/9856) Overwrite `--sequence` and `--account-number` flags with default flag values when used with `offline=false` in `sign-batch` command.
+>>>>>>> 96e162b8a (fix: null guard for tx fee amounts (#10327))
 * (types) [\#10021](https://github.com/cosmos/cosmos-sdk/pull/10021) Speedup coins.AmountOf(), by removing many intermittent regex calls.
 * [\#10077](https://github.com/cosmos/cosmos-sdk/pull/10077) Remove telemetry on `GasKV` and `CacheKV` store Get/Set operations, significantly improving their performance.
 * (store) [\#10026](https://github.com/cosmos/cosmos-sdk/pull/10026) Improve CacheKVStore datastructures / algorithms, to no longer take O(N^2) time when interleaving iterators and insertions.
diff --git a/types/coin.go b/types/coin.go
index e8fe7a5f8781..185f8b28e4c4 100644
--- a/types/coin.go
+++ b/types/coin.go
@@ -144,6 +144,11 @@ func (coin Coin) IsNegative() bool {
 	return coin.Amount.Sign() == -1
 }
 
+// IsNil returns true if the coin amount is nil and false otherwise.
+func (coin Coin) IsNil() bool {
+	return coin.Amount.i == nil
+}
+
 //-----------------------------------------------------------------------------
 // Coins
 
@@ -585,6 +590,19 @@ func (coins Coins) IsAnyNegative() bool {
 	return false
 }
 
+// IsAnyNil returns true if there is at least one coin whose amount
+// is nil; returns false otherwise. It returns false if the coin set
+// is empty too.
+func (coins Coins) IsAnyNil() bool {
+	for _, coin := range coins {
+		if coin.IsNil() {
+			return true
+		}
+	}
+
+	return false
+}
+
 // negative returns a set of coins with all amount negative.
 //
 // TODO: Remove once unsigned integers are used.
diff --git a/types/coin_test.go b/types/coin_test.go
index 9a5d83fea9c3..240b15d11de0 100644
--- a/types/coin_test.go
+++ b/types/coin_test.go
@@ -282,6 +282,20 @@ func (s *coinTestSuite) TestCoinIsZero() {
 	s.Require().False(res)
 }
 
+func (s *coinTestSuite) TestCoinIsNil() {
+	coin := sdk.Coin{}
+	res := coin.IsNil()
+	s.Require().True(res)
+
+	coin = sdk.Coin{Denom: "uatom"}
+	res = coin.IsNil()
+	s.Require().True(res)
+
+	coin = sdk.NewInt64Coin(testDenom1, 1)
+	res = coin.IsNil()
+	s.Require().False(res)
+}
+
 func (s *coinTestSuite) TestFilteredZeroCoins() {
 	cases := []struct {
 		name     string
@@ -944,6 +958,19 @@ func (s *coinTestSuite) TestCoinsIsAnyGT() {
 	}
 }
 
+func (s *coinTestSuite) TestCoinsIsAnyNil() {
+	twoAtom := sdk.NewInt64Coin("atom", 2)
+	fiveAtom := sdk.NewInt64Coin("atom", 5)
+	threeEth := sdk.NewInt64Coin("eth", 3)
+	nilAtom := sdk.Coin{Denom: "atom"}
+
+	s.Require().True(sdk.Coins{twoAtom, fiveAtom, threeEth, nilAtom}.IsAnyNil())
+	s.Require().True(sdk.Coins{twoAtom, nilAtom, fiveAtom, threeEth}.IsAnyNil())
+	s.Require().True(sdk.Coins{nilAtom, twoAtom, fiveAtom, threeEth}.IsAnyNil())
+	s.Require().False(sdk.Coins{twoAtom, fiveAtom, threeEth}.IsAnyNil())
+
+}
+
 func (s *coinTestSuite) TestMarshalJSONCoins() {
 	cdc := codec.NewLegacyAmino()
 	sdk.RegisterLegacyAminoCodec(cdc)
diff --git a/types/tx/types.go b/types/tx/types.go
index 84ce81edcbf8..3aa8bbbb5e55 100644
--- a/types/tx/types.go
+++ b/types/tx/types.go
@@ -62,6 +62,13 @@ func (t *Tx) ValidateBasic() error {
 		)
 	}
 
+	if fee.Amount.IsAnyNil() {
+		return sdkerrors.Wrapf(
+			sdkerrors.ErrInsufficientFee,
+			"invalid fee provided: null",
+		)
+	}
+
 	if fee.Amount.IsAnyNegative() {
 		return sdkerrors.Wrapf(
 			sdkerrors.ErrInsufficientFee,