diff --git a/cmd/gaia/app/app.go b/cmd/gaia/app/app.go
index 9436c8b0fc..df4429ee25 100644
--- a/cmd/gaia/app/app.go
+++ b/cmd/gaia/app/app.go
@@ -14,11 +14,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/wire"
 	"github.com/cosmos/cosmos-sdk/x/auth"
 	"github.com/cosmos/cosmos-sdk/x/bank"
-<<<<<<< HEAD
-	feed "github.com/cosmos/cosmos-sdk/x/fee_distribution"
-=======
 	"github.com/cosmos/cosmos-sdk/x/baseaccount"
->>>>>>> in progress
 	"github.com/cosmos/cosmos-sdk/x/ibc"
 	"github.com/cosmos/cosmos-sdk/x/stake"
 )
@@ -86,11 +82,7 @@ func NewGaiaApp(logger log.Logger, db dbm.DB) *GaiaApp {
 	app.SetInitChainer(app.initChainer)
 	app.SetEndBlocker(stake.NewEndBlocker(app.stakeKeeper))
 	app.MountStoresIAVL(app.keyMain, app.keyAccount, app.keyIBC, app.keyStake)
-<<<<<<< HEAD
-	app.SetAnteHandler(auth.NewAnteHandler(app.accountMapper, feed.BurnFeeHandler))
-=======
 	app.SetAnteHandler(auth.NewAnteHandler(app.accountMapper))
->>>>>>> in progress
 	err := app.LoadLatestVersion(app.keyMain)
 	if err != nil {
 		cmn.Exit(err.Error())
diff --git a/x/stake/test_common.go b/x/stake/test_common.go
index 19487c5785..e75faaf01a 100644
--- a/x/stake/test_common.go
+++ b/x/stake/test_common.go
@@ -92,12 +92,8 @@ func paramsNoInflation() Params {
 }
 
 // hogpodge of all sorts of input required for testing
-<<<<<<< HEAD
-func createTestInput(t *testing.T, isCheckTx bool, initCoins int64) (sdk.Context, sdk.AccountMapper, Keeper) {
-=======
 func createTestInput(t *testing.T, isCheckTx bool, initCoins int64) (sdk.Context, auth.AccountMapper, Keeper) {
-	db := dbm.NewMemDB()
->>>>>>> in progress
+
 	keyStake := sdk.NewKVStoreKey("stake")
 	keyAcc := sdk.NewKVStoreKey("acc")
 
@@ -111,8 +107,8 @@ func createTestInput(t *testing.T, isCheckTx bool, initCoins int64) (sdk.Context
 	ctx := sdk.NewContext(ms, abci.Header{ChainID: "foochainid"}, isCheckTx, nil, log.NewNopLogger())
 	cdc := makeTestCodec()
 	accountMapper := auth.NewAccountMapper(
-		cdc,                        // amino codec
-		keyMain,                    // target store
+		cdc,    // amino codec
+		keyAcc, // target store
 		&baseaccount.BaseAccount{}, // prototype
 	)
 	ck := bank.NewKeeper(accountMapper)