diff --git a/baseapp/baseapp.go b/baseapp/baseapp.go
index 8f08d2abf..6f143b156 100644
--- a/baseapp/baseapp.go
+++ b/baseapp/baseapp.go
@@ -137,31 +137,6 @@ func (app *BaseApp) MountStore(key sdk.StoreKey, typ sdk.StoreType) {
 	app.cms.MountStoreWithDB(key, typ, nil)
 }
 
-<<<<<<< HEAD
-=======
-// nolint - Set functions
-func (app *BaseApp) SetInitChainer(initChainer sdk.InitChainer) {
-	app.initChainer = initChainer
-}
-func (app *BaseApp) SetBeginBlocker(beginBlocker sdk.BeginBlocker) {
-	app.beginBlocker = beginBlocker
-}
-func (app *BaseApp) SetEndBlocker(endBlocker sdk.EndBlocker) {
-	app.endBlocker = endBlocker
-}
-func (app *BaseApp) SetAnteHandler(ah sdk.AnteHandler) {
-	app.anteHandler = ah
-}
-func (app *BaseApp) SetAddrPeerFilter(pf sdk.PeerFilter) {
-	app.addrPeerFilter = pf
-}
-func (app *BaseApp) SetPubKeyPeerFilter(pf sdk.PeerFilter) {
-	app.pubkeyPeerFilter = pf
-}
-func (app *BaseApp) Router() Router           { return app.router }
-func (app *BaseApp) QueryRouter() QueryRouter { return app.queryrouter }
-
->>>>>>> custom queriables
 // load latest application version
 func (app *BaseApp) LoadLatestVersion(mainKey sdk.StoreKey) error {
 	err := app.cms.LoadLatestVersion()
diff --git a/baseapp/setters.go b/baseapp/setters.go
index 86a647d32..ef88b7fe5 100644
--- a/baseapp/setters.go
+++ b/baseapp/setters.go
@@ -74,6 +74,12 @@ func (app *BaseApp) Router() Router {
 	}
 	return app.router
 }
+func (app *BaseApp) QueryRouter() QueryRouter {
+	if app.sealed {
+		panic("QueryRouter() on sealed BaseApp")
+	}
+	return app.queryrouter
+}
 func (app *BaseApp) Seal()          { app.sealed = true }
 func (app *BaseApp) IsSealed() bool { return app.sealed }
 func (app *BaseApp) enforceSeal() {