diff --git a/util/import/BUILD.bazel b/util/import/BUILD.bazel
index 8ce84bf041..2e42024e5e 100644
--- a/util/import/BUILD.bazel
+++ b/util/import/BUILD.bazel
@@ -5,12 +5,19 @@ rust_proc_macro(
     srcs = [
         "import.rs",
     ],
+<<<<<<< HEAD
     crate_name = "import",
     visibility = ["//visibility:public"],
+=======
+>>>>>>> ffc525b (Add new `import` macro prototype.)
     deps = [
         ":import_internal",
         "//util/import/raze:syn",
     ],
+<<<<<<< HEAD
+=======
+    visibility = ["//visibility:public"],
+>>>>>>> ffc525b (Add new `import` macro prototype.)
 )
 
 rust_library(
@@ -18,7 +25,10 @@ rust_library(
     srcs = [
         "import_internal.rs",
     ],
+<<<<<<< HEAD
     crate_name = "import_internal",
+=======
+>>>>>>> ffc525b (Add new `import` macro prototype.)
     deps = [
         "//util/import/raze:aho_corasick",
         "//util/import/raze:lazy_static",
diff --git a/util/import/raze/remote/BUILD.aho-corasick-0.7.15.bazel b/util/import/raze/remote/BUILD.aho-corasick-0.7.15.bazel
index 4fc8c0dcc3..6679a639c3 100644
--- a/util/import/raze/remote/BUILD.aho-corasick-0.7.15.bazel
+++ b/util/import/raze/remote/BUILD.aho-corasick-0.7.15.bazel
@@ -46,8 +46,13 @@ rust_library(
     ],
     tags = [
         "cargo-raze",
+<<<<<<< HEAD
         "crate-name=aho_corasick",
         "manual",
+=======
+        "manual",
+        "crate-name=aho_corasick"
+>>>>>>> ffc525b (Add new `import` macro prototype.)
     ],
     version = "0.7.15",
     # buildifier: leave-alone
diff --git a/util/import/raze/remote/BUILD.cfg-if-1.0.0.bazel b/util/import/raze/remote/BUILD.cfg-if-1.0.0.bazel
index 1a5adcfc20..736bc0f97e 100644
--- a/util/import/raze/remote/BUILD.cfg-if-1.0.0.bazel
+++ b/util/import/raze/remote/BUILD.cfg-if-1.0.0.bazel
@@ -44,8 +44,13 @@ rust_library(
     ],
     tags = [
         "cargo-raze",
+<<<<<<< HEAD
         "crate-name=cfg-if",
         "manual",
+=======
+        "manual",
+        "crate-name=cfg-if"
+>>>>>>> ffc525b (Add new `import` macro prototype.)
     ],
     version = "1.0.0",
     # buildifier: leave-alone
diff --git a/util/import/raze/remote/BUILD.env_logger-0.8.4.bazel b/util/import/raze/remote/BUILD.env_logger-0.8.4.bazel
index a04b02c24e..5dfeb4f565 100644
--- a/util/import/raze/remote/BUILD.env_logger-0.8.4.bazel
+++ b/util/import/raze/remote/BUILD.env_logger-0.8.4.bazel
@@ -45,8 +45,13 @@ rust_library(
     ],
     tags = [
         "cargo-raze",
+<<<<<<< HEAD
         "crate-name=env_logger",
         "manual",
+=======
+        "manual",
+        "crate-name=env_logger"
+>>>>>>> ffc525b (Add new `import` macro prototype.)
     ],
     version = "0.8.4",
     # buildifier: leave-alone
diff --git a/util/import/raze/remote/BUILD.getrandom-0.2.3.bazel b/util/import/raze/remote/BUILD.getrandom-0.2.3.bazel
index 83337579ba..b117918c7a 100644
--- a/util/import/raze/remote/BUILD.getrandom-0.2.3.bazel
+++ b/util/import/raze/remote/BUILD.getrandom-0.2.3.bazel
@@ -48,8 +48,13 @@ rust_library(
     ],
     tags = [
         "cargo-raze",
+<<<<<<< HEAD
         "crate-name=getrandom",
         "manual",
+=======
+        "manual",
+        "crate-name=getrandom"
+>>>>>>> ffc525b (Add new `import` macro prototype.)
     ],
     version = "0.2.3",
     # buildifier: leave-alone
diff --git a/util/import/raze/remote/BUILD.lazy_static-1.4.0.bazel b/util/import/raze/remote/BUILD.lazy_static-1.4.0.bazel
index 5542226b1a..9a85e5c4d9 100644
--- a/util/import/raze/remote/BUILD.lazy_static-1.4.0.bazel
+++ b/util/import/raze/remote/BUILD.lazy_static-1.4.0.bazel
@@ -44,8 +44,13 @@ rust_library(
     ],
     tags = [
         "cargo-raze",
+<<<<<<< HEAD
         "crate-name=lazy_static",
         "manual",
+=======
+        "manual",
+        "crate-name=lazy_static"
+>>>>>>> ffc525b (Add new `import` macro prototype.)
     ],
     version = "1.4.0",
     # buildifier: leave-alone
diff --git a/util/import/raze/remote/BUILD.libc-0.2.112.bazel b/util/import/raze/remote/BUILD.libc-0.2.112.bazel
index 2d8a3fe3f2..04e7e4046d 100644
--- a/util/import/raze/remote/BUILD.libc-0.2.112.bazel
+++ b/util/import/raze/remote/BUILD.libc-0.2.112.bazel
@@ -73,8 +73,13 @@ rust_library(
     ],
     tags = [
         "cargo-raze",
+<<<<<<< HEAD
         "crate-name=libc",
         "manual",
+=======
+        "manual",
+        "crate-name=libc"
+>>>>>>> ffc525b (Add new `import` macro prototype.)
     ],
     version = "0.2.112",
     # buildifier: leave-alone
diff --git a/util/import/raze/remote/BUILD.log-0.4.14.bazel b/util/import/raze/remote/BUILD.log-0.4.14.bazel
index 02efe53eea..35c9c44f70 100644
--- a/util/import/raze/remote/BUILD.log-0.4.14.bazel
+++ b/util/import/raze/remote/BUILD.log-0.4.14.bazel
@@ -77,8 +77,13 @@ rust_library(
     ],
     tags = [
         "cargo-raze",
+<<<<<<< HEAD
         "crate-name=log",
         "manual",
+=======
+        "manual",
+        "crate-name=log"
+>>>>>>> ffc525b (Add new `import` macro prototype.)
     ],
     version = "0.4.14",
     # buildifier: leave-alone
diff --git a/util/import/raze/remote/BUILD.memchr-2.4.1.bazel b/util/import/raze/remote/BUILD.memchr-2.4.1.bazel
index c8e37c37f0..67c8254a3d 100644
--- a/util/import/raze/remote/BUILD.memchr-2.4.1.bazel
+++ b/util/import/raze/remote/BUILD.memchr-2.4.1.bazel
@@ -79,8 +79,13 @@ rust_library(
     ],
     tags = [
         "cargo-raze",
+<<<<<<< HEAD
         "crate-name=memchr",
         "manual",
+=======
+        "manual",
+        "crate-name=memchr"
+>>>>>>> ffc525b (Add new `import` macro prototype.)
     ],
     version = "2.4.1",
     # buildifier: leave-alone
diff --git a/util/import/raze/remote/BUILD.proc-macro2-1.0.33.bazel b/util/import/raze/remote/BUILD.proc-macro2-1.0.33.bazel
index 0e479f265e..e5e6ee7103 100644
--- a/util/import/raze/remote/BUILD.proc-macro2-1.0.33.bazel
+++ b/util/import/raze/remote/BUILD.proc-macro2-1.0.33.bazel
@@ -77,8 +77,13 @@ rust_library(
     ],
     tags = [
         "cargo-raze",
+<<<<<<< HEAD
         "crate-name=proc-macro2",
         "manual",
+=======
+        "manual",
+        "crate-name=proc-macro2"
+>>>>>>> ffc525b (Add new `import` macro prototype.)
     ],
     version = "1.0.33",
     # buildifier: leave-alone
diff --git a/util/import/raze/remote/BUILD.quickcheck-1.0.3.bazel b/util/import/raze/remote/BUILD.quickcheck-1.0.3.bazel
index a9db2b4721..9571c78683 100644
--- a/util/import/raze/remote/BUILD.quickcheck-1.0.3.bazel
+++ b/util/import/raze/remote/BUILD.quickcheck-1.0.3.bazel
@@ -61,8 +61,13 @@ rust_library(
     ],
     tags = [
         "cargo-raze",
+<<<<<<< HEAD
         "crate-name=quickcheck",
         "manual",
+=======
+        "manual",
+        "crate-name=quickcheck"
+>>>>>>> ffc525b (Add new `import` macro prototype.)
     ],
     version = "1.0.3",
     # buildifier: leave-alone
diff --git a/util/import/raze/remote/BUILD.quote-1.0.10.bazel b/util/import/raze/remote/BUILD.quote-1.0.10.bazel
index 040d8cbc9a..f4ad4ca7fc 100644
--- a/util/import/raze/remote/BUILD.quote-1.0.10.bazel
+++ b/util/import/raze/remote/BUILD.quote-1.0.10.bazel
@@ -48,8 +48,13 @@ rust_library(
     ],
     tags = [
         "cargo-raze",
+<<<<<<< HEAD
         "crate-name=quote",
         "manual",
+=======
+        "manual",
+        "crate-name=quote"
+>>>>>>> ffc525b (Add new `import` macro prototype.)
     ],
     version = "1.0.10",
     # buildifier: leave-alone
diff --git a/util/import/raze/remote/BUILD.rand-0.8.4.bazel b/util/import/raze/remote/BUILD.rand-0.8.4.bazel
index ebbb9e3724..238c680d08 100644
--- a/util/import/raze/remote/BUILD.rand-0.8.4.bazel
+++ b/util/import/raze/remote/BUILD.rand-0.8.4.bazel
@@ -46,8 +46,13 @@ rust_library(
     ],
     tags = [
         "cargo-raze",
+<<<<<<< HEAD
         "crate-name=rand",
         "manual",
+=======
+        "manual",
+        "crate-name=rand"
+>>>>>>> ffc525b (Add new `import` macro prototype.)
     ],
     version = "0.8.4",
     # buildifier: leave-alone
diff --git a/util/import/raze/remote/BUILD.rand_core-0.6.3.bazel b/util/import/raze/remote/BUILD.rand_core-0.6.3.bazel
index 1cc93d3d1c..03d33a483d 100644
--- a/util/import/raze/remote/BUILD.rand_core-0.6.3.bazel
+++ b/util/import/raze/remote/BUILD.rand_core-0.6.3.bazel
@@ -45,8 +45,13 @@ rust_library(
     ],
     tags = [
         "cargo-raze",
+<<<<<<< HEAD
         "crate-name=rand_core",
         "manual",
+=======
+        "manual",
+        "crate-name=rand_core"
+>>>>>>> ffc525b (Add new `import` macro prototype.)
     ],
     version = "0.6.3",
     # buildifier: leave-alone
diff --git a/util/import/raze/remote/BUILD.regex-1.4.6.bazel b/util/import/raze/remote/BUILD.regex-1.4.6.bazel
index 0957c94112..b01607f8ee 100644
--- a/util/import/raze/remote/BUILD.regex-1.4.6.bazel
+++ b/util/import/raze/remote/BUILD.regex-1.4.6.bazel
@@ -64,8 +64,13 @@ rust_library(
     ],
     tags = [
         "cargo-raze",
+<<<<<<< HEAD
         "crate-name=regex",
         "manual",
+=======
+        "manual",
+        "crate-name=regex"
+>>>>>>> ffc525b (Add new `import` macro prototype.)
     ],
     version = "1.4.6",
     # buildifier: leave-alone
diff --git a/util/import/raze/remote/BUILD.regex-syntax-0.6.25.bazel b/util/import/raze/remote/BUILD.regex-syntax-0.6.25.bazel
index 71324e7ea4..b45657cdd8 100644
--- a/util/import/raze/remote/BUILD.regex-syntax-0.6.25.bazel
+++ b/util/import/raze/remote/BUILD.regex-syntax-0.6.25.bazel
@@ -46,8 +46,13 @@ rust_library(
     ],
     tags = [
         "cargo-raze",
+<<<<<<< HEAD
         "crate-name=regex-syntax",
         "manual",
+=======
+        "manual",
+        "crate-name=regex-syntax"
+>>>>>>> ffc525b (Add new `import` macro prototype.)
     ],
     version = "0.6.25",
     # buildifier: leave-alone
diff --git a/util/import/raze/remote/BUILD.syn-1.0.82.bazel b/util/import/raze/remote/BUILD.syn-1.0.82.bazel
index 8031e00c6b..4ad172d0ff 100644
--- a/util/import/raze/remote/BUILD.syn-1.0.82.bazel
+++ b/util/import/raze/remote/BUILD.syn-1.0.82.bazel
@@ -91,8 +91,13 @@ rust_library(
     ],
     tags = [
         "cargo-raze",
+<<<<<<< HEAD
         "crate-name=syn",
         "manual",
+=======
+        "manual",
+        "crate-name=syn"
+>>>>>>> ffc525b (Add new `import` macro prototype.)
     ],
     version = "1.0.82",
     # buildifier: leave-alone
diff --git a/util/import/raze/remote/BUILD.unicode-xid-0.2.2.bazel b/util/import/raze/remote/BUILD.unicode-xid-0.2.2.bazel
index a62237c028..c2a675bb9d 100644
--- a/util/import/raze/remote/BUILD.unicode-xid-0.2.2.bazel
+++ b/util/import/raze/remote/BUILD.unicode-xid-0.2.2.bazel
@@ -47,8 +47,13 @@ rust_library(
     ],
     tags = [
         "cargo-raze",
+<<<<<<< HEAD
         "crate-name=unicode-xid",
         "manual",
+=======
+        "manual",
+        "crate-name=unicode-xid"
+>>>>>>> ffc525b (Add new `import` macro prototype.)
     ],
     version = "0.2.2",
     # buildifier: leave-alone
diff --git a/util/import/raze/remote/BUILD.wasi-0.10.2+wasi-snapshot-preview1.bazel b/util/import/raze/remote/BUILD.wasi-0.10.2+wasi-snapshot-preview1.bazel
index f4229fe662..cfc92b34d8 100644
--- a/util/import/raze/remote/BUILD.wasi-0.10.2+wasi-snapshot-preview1.bazel
+++ b/util/import/raze/remote/BUILD.wasi-0.10.2+wasi-snapshot-preview1.bazel
@@ -46,8 +46,13 @@ rust_library(
     ],
     tags = [
         "cargo-raze",
+<<<<<<< HEAD
         "crate-name=wasi",
         "manual",
+=======
+        "manual",
+        "crate-name=wasi"
+>>>>>>> ffc525b (Add new `import` macro prototype.)
     ],
     version = "0.10.2+wasi-snapshot-preview1",
     # buildifier: leave-alone