Resolve conflict

cmd/lotus-miner/sectors.go

@@ -1558,7 +1558,7 @@ var sectorsMarkForUpgradeCmd = &cli.Command{
 		}
 
 		twoDays := abi.ChainEpoch(2 * builtin.EpochsInDay)
-		if head.Height() > (build.UpgradeSnapDealsHeight - twoDays) {
+		if head.Height() > (build.UpgradeOhSnapHeight - twoDays) {
 			return xerrors.Errorf("OhSnap is coming soon, " +
 				"please use `snap-up` to upgrade your cc sectors after the network v15 upgrade!")
 		}