diff --git a/expfmt/openmetrics_create_test.go b/expfmt/openmetrics_create_test.go
index 3942fa7e..6003cc96 100644
--- a/expfmt/openmetrics_create_test.go
+++ b/expfmt/openmetrics_create_test.go
@@ -33,9 +33,9 @@ func TestCreateOpenMetrics(t *testing.T) {
 	}
 
 	scenarios := []struct {
-		in  *dto.MetricFamily
+		in       *dto.MetricFamily
 		withUnit bool
-		out string
+		out      string
 	}{
 		// 0: Counter, timestamp given, no _total suffix.
 		{
@@ -447,28 +447,28 @@ foos_total 42.0
 				Type: dto.MetricType_HISTOGRAM.Enum(),
 				Unit: proto.String("microseconds"),
 				Metric: []*dto.Metric{
-					&dto.Metric{
+					{
 						Histogram: &dto.Histogram{
 							SampleCount: proto.Uint64(2693),
 							SampleSum:   proto.Float64(1756047.3),
 							Bucket: []*dto.Bucket{
-								&dto.Bucket{
+								{
 									UpperBound:      proto.Float64(100),
 									CumulativeCount: proto.Uint64(123),
 								},
-								&dto.Bucket{
+								{
 									UpperBound:      proto.Float64(120),
 									CumulativeCount: proto.Uint64(412),
 								},
-								&dto.Bucket{
+								{
 									UpperBound:      proto.Float64(144),
 									CumulativeCount: proto.Uint64(592),
 								},
-								&dto.Bucket{
+								{
 									UpperBound:      proto.Float64(172.8),
 									CumulativeCount: proto.Uint64(1524),
 								},
-								&dto.Bucket{
+								{
 									UpperBound:      proto.Float64(math.Inf(+1)),
 									CumulativeCount: proto.Uint64(2693),
 								},
diff --git a/go.sum b/go.sum
index 608f6b83..d4dbb7c0 100644
--- a/go.sum
+++ b/go.sum
@@ -31,21 +31,12 @@ github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f h1:KUppIJq7/+
 github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-<<<<<<< HEAD
-github.com/prometheus/client_golang v1.17.0 h1:rl2sfwZMtSthVU752MqfjQozy7blglC+1SOtjMAMh+Q=
-github.com/prometheus/client_golang v1.17.0/go.mod h1:VeL+gMmOAxkS2IqfCq0ZmHSL+LjWfWDUmp1mBz9JgUY=
-github.com/prometheus/client_model v0.5.1-0.20231205151710-c26a8eea9e44 h1:SQMgsr70ptWRWXsEsydAwKiRaomBk/Cfsv1BSNCNM3Y=
-github.com/prometheus/client_model v0.5.1-0.20231205151710-c26a8eea9e44/go.mod h1:dTiFglRmd66nLR9Pv9f0mZi7B7fk5Pm3gvsjB5tr+kI=
-github.com/prometheus/procfs v0.11.1 h1:xRC8Iq1yyca5ypa9n1EZnWZkt7dwcoRPQwX/5gwaUuI=
-github.com/prometheus/procfs v0.11.1/go.mod h1:eesXgaPo1q7lBpVMoMy0ZOFTth9hBn4W/y0/p/ScXhY=
-=======
 github.com/prometheus/client_golang v1.18.0 h1:HzFfmkOzH5Q8L8G+kSJKUx5dtG87sewO+FoDDqP5Tbk=
 github.com/prometheus/client_golang v1.18.0/go.mod h1:T+GXkCk5wSJyOqMIzVgvvjFDlkOQntgjkJWKrN5txjA=
-github.com/prometheus/client_model v0.5.0 h1:VQw1hfvPvk3Uv6Qf29VrPF32JB6rtbgI6cYPYQjL0Qw=
-github.com/prometheus/client_model v0.5.0/go.mod h1:dTiFglRmd66nLR9Pv9f0mZi7B7fk5Pm3gvsjB5tr+kI=
+github.com/prometheus/client_model v0.5.1-0.20231205151710-c26a8eea9e44 h1:SQMgsr70ptWRWXsEsydAwKiRaomBk/Cfsv1BSNCNM3Y=
+github.com/prometheus/client_model v0.5.1-0.20231205151710-c26a8eea9e44/go.mod h1:dTiFglRmd66nLR9Pv9f0mZi7B7fk5Pm3gvsjB5tr+kI=
 github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo=
 github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo=
->>>>>>> prometheus/main
 github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
 github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=