fix build

Author: zvonand

src/Disks/ObjectStorages/IObjectStorage.h

@@ -30,6 +30,7 @@
 
 #include <Processors/ISimpleTransform.h>
 #include <Storages/ObjectStorage/DataLakes/DataLakeObjectMetadata.h>
+#include <Storages/ObjectStorage/DataLakes/IDataLakeMetadata.h>
 
 #include <Interpreters/Context_fwd.h>
 #include "config.h"
@@ -108,7 +109,6 @@ struct ObjectMetadata
 };
 
 
-struct DataFileInfo;
 class DataFileMetaInfo;
 using DataFileMetaInfoPtr = std::shared_ptr<DataFileMetaInfo>;
 
@@ -179,7 +179,6 @@ struct PathWithMetadata
     PathWithMetadata(const PathWithMetadata & other) = default;
 
     virtual ~PathWithMetadata() = default;
-//>>>>>>> 53a743ff8c6 (first draft)
 
     virtual std::string getFileName() const { return std::filesystem::path(relative_path).filename(); }
     virtual std::string getFileNameWithoutExtension() const { return std::filesystem::path(relative_path).stem(); }