fix missing conflict marker

Author: arthurpassos

src/Core/Settings.cpp

@@ -6842,16 +6842,11 @@ Run all tasks of a distributed query plan locally. Useful for testing and debugg
     DECLARE(UInt64, distributed_plan_default_shuffle_join_bucket_count, 8, R"(
 Default number of buckets for distributed shuffle-hash-join.
 )", EXPERIMENTAL) \
-<<<<<<< HEAD
     DECLARE(UInt64, distributed_plan_default_reader_bucket_count, 8, R"(
 Default number of tasks for parallel reading in distributed query. Tasks are spread across between replicas.
-=======
+)", EXPERIMENTAL) \
     DECLARE(Bool, use_object_storage_list_objects_cache, false, R"(
 Cache the list of objects returned by list objects calls in object storage
-)", EXPERIMENTAL) \
-    DECLARE(Bool, object_storage_remote_initiator, false, R"(
-Execute request to object storage as remote on one of object_storage_cluster nodes.
->>>>>>> ff42c3a62bd (Merge pull request #805 from Altinity/list_objects_object_storage_cache_25.3)
 )", EXPERIMENTAL) \
     DECLARE(Bool, distributed_plan_optimize_exchanges, true, R"(
 Removes unnecessary exchanges in distributed query plan. Disable it for debugging.