clange format and add FallbackPass

core/src/index/knowhere/knowhere/index/vector_index/IndexIVF.h

@@ -47,7 +47,6 @@ class IVF : public VectorIndex, public FaissBaseIndex {
     void
     set_index_model(IndexModelPtr model) override;
 
-
     void
     Add(const DatasetPtr& dataset, const Config& config) override;
 

core/src/scheduler/SchedInst.h

@@ -104,14 +104,13 @@ class OptimizerInst {
                 pass_list.push_back(std::make_shared<HybridPass>());
 #ifdef MILVUS_CPU_VERSION
                 pass_list.push_back(std::make_shared<OnlyCPUPass>());
-<<<<<<< HEAD
 #else
                 server::Config& config = server::Config::GetInstance();
                 std::vector<int32_t> build_resources;
                 config.GetGpuResourceConfigBuildIndexResources(build_resources);
                 pass_list.push_back(std::make_shared<BuildIndexPass>(build_resources));
 #endif
-//                pass_list.push_back(std::make_shared<FallbackPass>());
+                pass_list.push_back(std::make_shared<FallbackPass>());
                 instance = std::make_shared<Optimizer>(pass_list);
             }
         }