diff --git a/v2/public-resolvers.md b/v2/public-resolvers.md
index 3c26546e..6280d05e 100644
--- a/v2/public-resolvers.md
+++ b/v2/public-resolvers.md
@@ -2193,8 +2193,5 @@ sdns://AQcAAAAAAAAAETc0LjExOC4xNDEuNDc6NDQyILLrUp55NwetKjM1XaPs19NIKDIbD1w0K-lCK
 
 DNSSEC/unfiltered/non-logged. Hosted on TeraSwitch in Pittsburgh, PA. Running the official Docker image by @zackptg5
 
-
->>>>>>> parent of d03f57d (zackptg5-us-pit is down)
-
 sdns://AQcAAAAAAAAAJ1syNjA3OmZkYzA6MjowOmY4MTY6M2VmZjpmZTMyOmM3YjRdOjQ0MiCy61KeeTcHrSozNV2j7NfTSCgyGw9cNCvpQit9_4CnIB8yLmRuc2NyeXB0LWNlcnQuemFja3B0ZzUtdXMtcGl0
 
diff --git a/v2/public-resolvers.md.minisig b/v2/public-resolvers.md.minisig
index a91fc708..a4dae334 100644
--- a/v2/public-resolvers.md.minisig
+++ b/v2/public-resolvers.md.minisig
@@ -1,4 +1,4 @@
 untrusted comment: signature from minisign secret key
-RWQf6LRCGA9i57kOpzZkB8XvB2pbcZGXQUQJlvhzpdflcD2lbG4z2DULUyiMTljbakcu/SG1IsgTuhR8UyQLwl6lIpF5R3ZX2A0=
-trusted comment: timestamp:1627168728	file:public-resolvers.md
-0WhHZilxWwVCTcuFLMB91Gb1euJsz70/5HBpWgV2AYfZlmQ/0iwUtTFm9inbh2eH5pfphkcuTo8KbMxtdSSzDQ==
+RWQf6LRCGA9i5xeUXRIBsO7H0xT9t3Y/fMKHdaedECGWEWxikKub7Jqm5/CEOdOYA8IYE0KO+jDZ8PmaYq/GzDAGiOArqpLZAAQ=
+trusted comment: timestamp:1627413148	file:public-resolvers.md
+IiZNYkIYIBCSW0oR4g8zo6QLIN4m2QZe8VlJJccfwnvMFfwRFxB2uJ/yODC/TOnJd37r5NmP8ygVl5g2/eLMBA==
diff --git a/v3/public-resolvers.md b/v3/public-resolvers.md
index 9ca08ee0..4771b52d 100644
--- a/v3/public-resolvers.md
+++ b/v3/public-resolvers.md
@@ -2216,8 +2216,5 @@ sdns://AQcAAAAAAAAAETc0LjExOC4xNDEuNDc6NDQyILLrUp55NwetKjM1XaPs19NIKDIbD1w0K-lCK
 
 DNSSEC/unfiltered/non-logged. Hosted on TeraSwitch in Pittsburgh, PA. Running the official Docker image by @zackptg5
 
-
->>>>>>> parent of d03f57d (zackptg5-us-pit is down)
-
 sdns://AQcAAAAAAAAAJ1syNjA3OmZkYzA6MjowOmY4MTY6M2VmZjpmZTMyOmM3YjRdOjQ0MiCy61KeeTcHrSozNV2j7NfTSCgyGw9cNCvpQit9_4CnIB8yLmRuc2NyeXB0LWNlcnQuemFja3B0ZzUtdXMtcGl0
 
diff --git a/v3/public-resolvers.md.minisig b/v3/public-resolvers.md.minisig
index cf499621..8318c60c 100644
--- a/v3/public-resolvers.md.minisig
+++ b/v3/public-resolvers.md.minisig
@@ -1,4 +1,4 @@
 untrusted comment: signature from minisign secret key
-RWQf6LRCGA9i5/PJMlsOO9Z1mm6MSBlefTXsVC8wT4a78giL3HUM8STN9T0oU0NpAD1TyzbU7ImeIoGFedyX/qAIXNgBfYnaaQQ=
-trusted comment: timestamp:1627168728	file:public-resolvers.md
-M43RG18Xzbq4ouGyVyVKJkJ0Ble1y9piQ0k7YQNchg+QinotRKKHIT8mmGAjhuuI8RnODqRTCux2ISTpmamlAg==
+RWQf6LRCGA9i54AbK5rncX4YEuBoAOp018zl85LZWP1Wa2CbnhlBJKS9DFtMP8RbmkHeo8Yoy9TiQVzMNeyNtFXxT2VTuIBloQY=
+trusted comment: timestamp:1627413148	file:public-resolvers.md
+HcL068nmieANcZzcSgX/F8wtw2JDS2nKDwlc1taTL1A3Y2QJ3c0/FVYqsfMsMtYS8bETCS02gfQSgoADPz67BQ==