Restore accidentally deleted comment

Author: thomaspanf

shared/services/config/rocket-pool-config.go

@@ -145,6 +145,7 @@ type RocketPoolConfig struct {
 // * Improve peer discovery and node performance
 // * Avoid unnecessary container restarts caused by switching between IPv4 and IPv6
 func getExternalIP() (net.IP, error) {
+	// Try IPv4 first
 	consensusConfig := externalip.ConsensusConfig{Timeout: 3 * time.Second}
 	ip4Consensus := externalip.DefaultConsensus(&consensusConfig, nil)
 	err := ip4Consensus.UseIPProtocol(4)

shared/services/connectivity/check-port-connectivity.go

@@ -181,11 +181,7 @@ func getPublicIP() (string, error) {
 // isPortReachableNATReflection attempts a TCP connection to host:port and returns true if
 // the connection succeeds within portCheckTimeout.
 func isPortReachableNATReflection(host string, port uint16) bool {
-<<<<<<< HEAD
 	address := net.JoinHostPort(host, strconv.FormatUint(uint64(port), 10))
-=======
-	address := net.JoinHostPort(host, fmt.Sprintf("%d", port))
->>>>>>> 892137d9a (Use JoinHostPort)
 	conn, err := net.DialTimeout("tcp", address, portCheckTimeout)
 	if err != nil {
 		return false