diff --git a/cmd/celestia-appd/cmd/start.go b/cmd/celestia-appd/cmd/start.go
index b9f767ba0a..057ae4422a 100644
--- a/cmd/celestia-appd/cmd/start.go
+++ b/cmd/celestia-appd/cmd/start.go
@@ -14,6 +14,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/celestiaorg/celestia-app/v3/pkg/appconsts"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/codec"
@@ -117,8 +118,6 @@ is performed. Note, when enabled, gRPC will also be automatically enabled.
 				return err
 			}
 
-<<<<<<< HEAD
-=======
 			switch clientCtx.ChainID {
 			case appconsts.ArabicaChainID:
 				serverCtx.Logger.Info(fmt.Sprintf("Since the chainID is %v, configuring the default v2 upgrade height to %v", appconsts.ArabicaChainID, appconsts.ArabicaUpgradeHeightV2))
@@ -137,7 +136,6 @@ is performed. Note, when enabled, gRPC will also be automatically enabled.
 				return fmt.Errorf("the --timeout-commit flag was used on %v but it is unsupported on public networks: %v. The --timeout-commit flag should only be used on private testnets", clientCtx.ChainID, strings.Join(appconsts.PublicNetworks, ", "))
 			}
 
->>>>>>> d20916c7 (feat: override timeout commit via `--timeout-commit` (#4103))
 			withTM, _ := cmd.Flags().GetBool(flagWithTendermint)
 			if !withTM {
 				serverCtx.Logger.Info("starting ABCI without Tendermint")
diff --git a/docs/maintainers/release-guide.md b/docs/maintainers/release-guide.md
index 698799235e..36e92e6649 100644
--- a/docs/maintainers/release-guide.md
+++ b/docs/maintainers/release-guide.md
@@ -32,7 +32,7 @@ Follow the [creating a release candidate](#creating-a-release-candidate) section
 - The version tag should not include the `-rc` suffix.
 - If the release targets a testnet, suffix the release with `-arabica` or `-mocha`.
 - The release notes should contain an **Upgrade Notice** section with notable changes for node operators or library consumers.
-- The release notes section should contain a link to https://github.com/celestiaorg/celestia-app/blob/main/docs/release-notes/release-notes.md where we capture breaking changes
+- The release notes section should contain a link to <https://github.com/celestiaorg/celestia-app/blob/main/docs/release-notes/release-notes.md> where we capture breaking changes
 
 After creating the release:
 
diff --git a/docs/release-notes/release-notes.md b/docs/release-notes/release-notes.md
index 48e72f45ee..a692d2d71d 100644
--- a/docs/release-notes/release-notes.md
+++ b/docs/release-notes/release-notes.md
@@ -9,10 +9,10 @@ This guide provides notes for major version releases. These notes may be helpful
 #### Enabling BBR and MCTCP
 
 Consensus node operators must enable the BBR (Bottleneck Bandwidth and Round-trip propagation time) congestion control algorithm. See [#3774](https://github.com/celestiaorg/celestia-app/pull/3774).
-if using linux in docker, kubernetes, a vm or baremetal, this can be done by calling 
+if using linux in docker, kubernetes, a vm or baremetal, this can be done by calling
 
 ```sh
-make enable-bbr 
+make enable-bbr
 ```
 
 command on the host machine.
@@ -54,7 +54,7 @@ You can track the tally of signalling by validators using the following query
 celestia-appd query signal tally 3
 ```
 
-Once 5/6+ of the voting power have signalled, the upgrade will be ready. There is a hard coded delay between confirmation of the upgrade and execution to the new state machine. 
+Once 5/6+ of the voting power have signalled, the upgrade will be ready. There is a hard coded delay between confirmation of the upgrade and execution to the new state machine.
 
 To view the upcoming upgrade height use the following query:
 
diff --git a/pkg/appconsts/chain_ids.go b/pkg/appconsts/chain_ids.go
index b7274a3264..5a7e7a0e20 100644
--- a/pkg/appconsts/chain_ids.go
+++ b/pkg/appconsts/chain_ids.go
@@ -2,6 +2,8 @@ package appconsts
 
 const (
 	ArabicaChainID = "arabica-11"
+	MochaChainID   = "mocha-4"
+	MainnetChainID = "celestia"
 )
 
 var PublicNetworks = []string{ArabicaChainID, MochaChainID, MainnetChainID}
diff --git a/pkg/appconsts/upgrade_heights.go b/pkg/appconsts/upgrade_heights.go
new file mode 100644
index 0000000000..13ee0963f0
--- /dev/null
+++ b/pkg/appconsts/upgrade_heights.go
@@ -0,0 +1,13 @@
+package appconsts
+
+const (
+	// ArabicaUpgradeHeightV2 is the block height at which the arabica-11
+	// upgraded from app version 1 to 2.
+	ArabicaUpgradeHeightV2 = 1751707
+	// MochaUpgradeHeightV2 is the block height at which the mocha-4 upgraded
+	// from app version 1 to 2.
+	MochaUpgradeHeightV2 = 2585031
+	// MainnetUpgradeHeightV2 is the block height at which the celestia upgraded
+	// from app version 1 to 2.
+	MainnetUpgradeHeightV2 = 2371495
+)
diff --git a/scripts/single-node.sh b/scripts/single-node.sh
index a6a944047a..2651afbac4 100755
--- a/scripts/single-node.sh
+++ b/scripts/single-node.sh
@@ -104,13 +104,8 @@ startCelestiaApp() {
     --api.enable \
     --grpc.enable \
     --grpc-web.enable \
-<<<<<<< HEAD
-    --v2-upgrade-height 3 \
-    --force-no-bbr // no need to require BBR usage on a local node
-=======
     --timeout-commit 1s \
     --force-no-bbr # no need to require BBR usage on a local node
->>>>>>> d20916c7 (feat: override timeout commit via `--timeout-commit` (#4103))
 }
 
 if [ -f $GENESIS_FILE ]; then