diff --git a/rosbag2_test_common/include/rosbag2_test_common/temporary_directory_fixture.hpp b/rosbag2_test_common/include/rosbag2_test_common/temporary_directory_fixture.hpp
index ebf967044..a6fec28d5 100644
--- a/rosbag2_test_common/include/rosbag2_test_common/temporary_directory_fixture.hpp
+++ b/rosbag2_test_common/include/rosbag2_test_common/temporary_directory_fixture.hpp
@@ -33,9 +33,6 @@ class TemporaryDirectoryFixture : public Test
 public:
   TemporaryDirectoryFixture()
   {
-<<<<<<< HEAD
-    temporary_dir_path_ = rcpputils::fs::create_temp_directory("tmp_test_dir_").string();
-=======
     std::filesystem::path parent_path = std::filesystem::path("/tmpfs");
     if (!std::filesystem::exists(parent_path)) {
       std::cerr << "The '/tmpfs' doesn't exist, falling back to the default temp directory \n";
@@ -43,13 +40,12 @@ class TemporaryDirectoryFixture : public Test
     }
 
     temporary_dir_path_ =
-      rcpputils::fs::create_temporary_directory("tmp_test_dir_", parent_path).string();
->>>>>>> 1d60d7b (Use tmpfs in rosbag2 temporary_directory_fixture (#1901))
+      rcpputils::fs::create_temp_directory("tmp_test_dir_", parent_path).string();
   }
 
   ~TemporaryDirectoryFixture() override
   {
-    rcpputils::fs::remove_all(rcpputils::fs::path(temporary_dir_path_));
+    std::filesystem::remove_all(std::filesystem::path(temporary_dir_path_));
   }
 
   std::string temporary_dir_path_;
diff --git a/rosbag2_transport/test/rosbag2_transport/test_rewrite.cpp b/rosbag2_transport/test/rosbag2_transport/test_rewrite.cpp
index 3eb48f673..c85016945 100644
--- a/rosbag2_transport/test/rosbag2_transport/test_rewrite.cpp
+++ b/rosbag2_transport/test/rosbag2_transport/test_rewrite.cpp
@@ -55,12 +55,7 @@ class TestRewrite : public ParametrizedTemporaryDirectoryFixture
 public:
   TestRewrite()
   {
-<<<<<<< HEAD
-    auto tmp_dir = rcpputils::fs::create_temp_directory("test_bag_rewrite");
-    output_dir_ = fs::path(tmp_dir.string());
-=======
     output_dir_ = fs::path(temporary_dir_path_);
->>>>>>> 1d60d7b (Use tmpfs in rosbag2 temporary_directory_fixture (#1901))
     storage_id_ = GetParam();
     bags_path_ = fs::path(_SRC_RESOURCES_DIR_PATH) / storage_id_;
   }