diff --git a/components/ipfs/ipfs_network_utils.cc b/components/ipfs/ipfs_network_utils.cc
index f448d44db357..39c7e61e7b85 100644
--- a/components/ipfs/ipfs_network_utils.cc
+++ b/components/ipfs/ipfs_network_utils.cc
@@ -164,6 +164,10 @@ std::unique_ptr<storage::BlobDataBuilder> BuildBlobWithFolder(
 
 namespace ipfs {
 
+<<<<<<< HEAD
+=======
+
+>>>>>>> 8ba05e73c8 (Implemented IPFS import refactoring)
 std::unique_ptr<network::SimpleURLLoader> CreateURLLoader(
     const GURL& gurl,
     const std::string& method,
@@ -248,8 +252,13 @@ void CreateRequestForFile(const base::FilePath& upload_file_path,
                           size_t file_size) {
   std::string mime_boundary = net::GenerateMimeMultipartBoundary();
   auto blob_builder_callback =
+<<<<<<< HEAD
       base::BindOnce(&BuildBlobWithFile, upload_file_path, mime_type, filename,
                      mime_boundary, file_size);
+=======
+      base::BindOnce(&BuildBlobWithFile, upload_file_path, mime_type,
+                     filename, mime_boundary, file_size);
+>>>>>>> 8ba05e73c8 (Implemented IPFS import refactoring)
   std::string content_type = ipfs::kIPFSImportMultipartContentType;
   content_type += " boundary=";
   content_type += mime_boundary;
@@ -257,11 +266,20 @@ void CreateRequestForFile(const base::FilePath& upload_file_path,
   base::PostTaskAndReplyWithResult(
       FROM_HERE, {base::MayBlock(), content::BrowserThread::IO},
       base::BindOnce(&CreateResourceRequest, std::move(blob_builder_callback),
+<<<<<<< HEAD
                      content_type, std::move(storage)),
       std::move(request_callback));
 }
 
 std::vector<ImportFileInfo> EnumerateDirectoryFiles(base::FilePath dir_path) {
+=======
+                    content_type, std::move(storage)),
+      std::move(request_callback));
+}
+
+std::vector<ImportFileInfo> EnumerateDirectoryFiles(
+    base::FilePath dir_path) {
+>>>>>>> 8ba05e73c8 (Implemented IPFS import refactoring)
   std::vector<ImportFileInfo> files;
   base::FileEnumerator file_enum(
       dir_path, true,
diff --git a/components/ipfs/ipfs_network_utils_unittest.cc b/components/ipfs/ipfs_network_utils_unittest.cc
index 23db54c4edd8..093702f23b2c 100644
--- a/components/ipfs/ipfs_network_utils_unittest.cc
+++ b/components/ipfs/ipfs_network_utils_unittest.cc
@@ -16,11 +16,13 @@
 #include "services/network/public/cpp/data_element.h"
 #include "storage/browser/blob/blob_data_builder.h"
 #include "storage/browser/blob/blob_data_item.h"
+
+#include "services/network/public/cpp/data_element.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace ipfs {
 
-class IpfsNetwrokUtilsUnitTest : public testing::Test {
+class IpfsNetwrokUtilsUnitTest : public ChromeRenderViewHostTestHarness {
  public:
   IpfsNetwrokUtilsUnitTest() {}
   ~IpfsNetwrokUtilsUnitTest() override = default;