diff --git a/src/Disks/IDisk.h b/src/Disks/IDisk.h
index e425615f5db..0d378f33204 100644
--- a/src/Disks/IDisk.h
+++ b/src/Disks/IDisk.h
@@ -201,7 +201,7 @@ public:
     /// Remove file. Throws exception if file doesn't exists or if directory is not empty.
     /// Differs from removeFile for S3/HDFS disks
     /// Second bool param is a flag to remove (true) or keep (false) shared data on S3
-    virtual void removeSharedFile(const String & path, bool /* keep_shared_data */) { return removeFile(path); }
+    virtual void removeSharedFile(const String & path, bool /* keep_shared_data */) { removeFile(path); }
 
     /// Remove file or directory with all children. Use with extra caution. Throws exception if file doesn't exists.
     /// Differs from removeRecursive for S3/HDFS disks
@@ -212,7 +212,7 @@ public:
     /// Remove file or directory if it exists.
     /// Differs from removeFileIfExists for S3/HDFS disks
     /// Second bool param is a flag to remove (true) or keep (false) shared data on S3
-    virtual void removeSharedFileIfExists(const String & path, bool /* keep_shared_data */) { return removeFileIfExists(path); }
+    virtual void removeSharedFileIfExists(const String & path, bool /* keep_shared_data */) { removeFileIfExists(path); }
 
     virtual const String & getCacheBasePath() const { throw Exception(ErrorCodes::NOT_IMPLEMENTED, "There is no cache path"); }
 
diff --git a/tests/config/config.d/storage_conf.xml b/tests/config/config.d/storage_conf.xml
index 9a66e86651b..28e203130aa 100644
--- a/tests/config/config.d/storage_conf.xml
+++ b/tests/config/config.d/storage_conf.xml
@@ -115,7 +115,6 @@
                     </main>
                 </volumes>
             </s3_cache_3>
-<<<<<<< HEAD
             <local_cache>
                 <volumes>
                     <main>
@@ -137,7 +136,6 @@
                     </main>
                 </volumes>
             </local_cache_3>
-=======
             <s3_cache_4>
                 <volumes>
                     <main>
@@ -145,7 +143,6 @@
                     </main>
                 </volumes>
             </s3_cache_4>
->>>>>>> upstream/master
         </policies>
     </storage_configuration>
 </clickhouse>