diff --git a/cmd/ethereum/flags.go b/cmd/ethereum/flags.go
index 0bea737949..e709ecf50a 100644
--- a/cmd/ethereum/flags.go
+++ b/cmd/ethereum/flags.go
@@ -85,8 +85,13 @@ func Init() {
 	flag.StringVar(&KeyRing, "keyring", "", "identifier for keyring to use")
 	flag.StringVar(&KeyStore, "keystore", "db", "system to store keyrings: db|file (db)")
 	flag.StringVar(&OutboundPort, "port", "30303", "listening port")
+<<<<<<< HEAD
 	flag.StringVar(&NatType, "nat", "", "nat support (UPNP|PMP)")
 	flag.StringVar(&PMPGateway, "gateway", "", "PMP gateway IP")
+=======
+	flag.StringVar(&NatType, "nat", "", "NAT support (UPNP|PMP) (none)")
+	flag.StringVar(&PMPGateway, "pmp", "", "Gateway IP for PMP")
+>>>>>>> adapt cmd/cli to new backend
 	flag.IntVar(&MaxPeer, "maxpeer", 10, "maximum desired peers")
 	flag.IntVar(&RpcPort, "rpcport", 8080, "port to start json-rpc server on")
 	flag.BoolVar(&StartRpc, "rpc", false, "start rpc server")
diff --git a/cmd/utils/cmd.go b/cmd/utils/cmd.go
index 24d5970bd6..867ef5e374 100644
--- a/cmd/utils/cmd.go
+++ b/cmd/utils/cmd.go
@@ -154,13 +154,22 @@ func NatType(natType string, gateway string) (nat p2p.NAT) {
 		nat = p2p.UPNP()
 	case "PMP":
 		ip := net.ParseIP(gateway)
+<<<<<<< HEAD
 		if ip != nil {
 			clilogger.Fatalf("bad PMP gateway '%s'", gateway)
+=======
+		if ip == nil {
+			clilogger.Fatalln("cannot resolve PMP gateway IP %s", gateway)
+>>>>>>> adapt cmd/cli to new backend
 		}
 		nat = p2p.PMP(ip)
 	case "":
 	default:
+<<<<<<< HEAD
 		clilogger.Fatalf("unrecognised NAT type '%s'", natType)
+=======
+		clilogger.Fatalln("unrecognised NAT type %s", natType)
+>>>>>>> adapt cmd/cli to new backend
 	}
 	return
 }