diff --git a/go.mod b/go.mod
index 16df88aa..42f16395 100644
--- a/go.mod
+++ b/go.mod
@@ -81,21 +81,9 @@ require (
 	gopkg.in/alecthomas/kingpin.v2 v2.2.6 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
-<<<<<<< HEAD
 	gopkg.in/yaml.v3 v3.0.0 // indirect
 	k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
-	k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
 	sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
-||||||| parent of 2b4874e5 (Add kube_pod_ips gauge to pod metrics)
-	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
-	k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
-	k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
-	sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
-=======
-	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
-	k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
-	sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
->>>>>>> 2b4874e5 (Add kube_pod_ips gauge to pod metrics)
 	sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
 	sigs.k8s.io/yaml v1.3.0 // indirect
 )
diff --git a/internal/store/pod.go b/internal/store/pod.go
index e592ac2c..5cba91fb 100644
--- a/internal/store/pod.go
+++ b/internal/store/pod.go
@@ -596,10 +596,13 @@ func createPodIPFamilyGenerator() generator.FamilyGenerator {
 			for i, ip := range p.Status.PodIPs {
 				netIP := net.ParseIPSloppy(ip.IP)
 				var ipFamily net.IPFamily
-				if net.IsIPv4(netIP) {
+				switch {
+				case net.IsIPv4(netIP):
 					ipFamily = net.IPv4
-				} else {
+				case net.IsIPv6(netIP):
 					ipFamily = net.IPv6
+				default:
+					continue // nil from ParseIPSloppy indicates failure to parse, so we don't include that in our metrics series
 				}
 				ms[i] = &metric.Metric{
 					LabelKeys:   labelKeys,