fix merge conflict

Cargo.lock

@@ -1181,6 +1181,16 @@ dependencies = [
  "percent-encoding",
 ]
 
+[[package]]
+name = "fqdn"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0f5d7f7b3eed2f771fc7f6fcb651f9560d7b0c483d75876082acb4649d266b3"
+dependencies = [
+ "punycode",
+ "serde",
+]
+
 [[package]]
 name = "funty"
 version = "2.0.0"
@@ -1407,6 +1417,7 @@ dependencies = [
  "dockerfile_builder",
  "email_address",
  "env_logger",
+ "fqdn",
  "harmony_macros",
  "harmony_types",
  "helm-wrapper-rs",
@@ -3026,6 +3037,12 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "punycode"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e9e1dcb320d6839f6edb64f7a4a59d39b30480d4d1765b56873f7c858538a5fe"
+
 [[package]]
 name = "quote"
 version = "1.0.40"