diff --git a/src/Storages/ObjectStorage/DataLakes/IcebergMetadata.cpp b/src/Storages/ObjectStorage/DataLakes/IcebergMetadata.cpp
index a3695e749e4..070f8061286 100644
--- a/src/Storages/ObjectStorage/DataLakes/IcebergMetadata.cpp
+++ b/src/Storages/ObjectStorage/DataLakes/IcebergMetadata.cpp
@@ -702,14 +702,8 @@ IcebergMetadata::create(ObjectStoragePtr object_storage, ConfigurationObserverPt
  */
 DataFileInfos IcebergMetadata::getDataFileInfos(const ActionsDAG * filter_dag) const
 {
-<<<<<<< HEAD
     // if (!data_file_infos.empty())
     //     return data_file_infos;
-=======
-    auto configuration_ptr = configuration.lock();
-    if (!data_files.empty())
-        return data_files;
->>>>>>> 7a393dc140a3da46162e3ae2a8b5ac8af2f42778
 
     Strings manifest_files;
     if (manifest_list_file.empty())
@@ -1052,7 +1046,6 @@ DataFileInfos IcebergMetadata::getDataFileInfos(const ActionsDAG * filter_dag) c
 
     return data_file_infos;
 }
-
 }
 
 #endif
diff --git a/src/Storages/ObjectStorage/DataLakes/IcebergMetadata.h b/src/Storages/ObjectStorage/DataLakes/IcebergMetadata.h
index 6695ac0ddc8..c0838e5eb55 100644
--- a/src/Storages/ObjectStorage/DataLakes/IcebergMetadata.h
+++ b/src/Storages/ObjectStorage/DataLakes/IcebergMetadata.h
@@ -252,7 +252,7 @@ public:
 
     /// Get data files. On first request it reads manifest_list file and iterates through manifest files to find all data files.
     /// All subsequent calls will return saved list of files (because it cannot be changed without changing metadata file)
-    DataFileInfos getDataFileInfos(const ActionsDAG * filter_dag) const override;
+    Strings getDataFileInfos() const override;
 
     /// Get table schema parsed from metadata.
     NamesAndTypesList getTableSchema() const override { return schema; }