Fix merge

src/display_models/get_model_metadata.py

@@ -26,7 +26,6 @@ def get_model_infos_from_hub(leaderboard_data: List[dict]):
 
     for model_data in tqdm(leaderboard_data):
         model_name = model_data["model_name_for_query"]
-<<<<<<< HEAD
 
         if model_name in model_info_cache:
             model_info = model_info_cache[model_name]
@@ -40,16 +39,6 @@ def get_model_infos_from_hub(leaderboard_data: List[dict]):
                 model_data[AutoEvalColumn.likes.name] = None
                 model_data[AutoEvalColumn.params.name] = get_model_size(model_name, None)
                 continue
-=======
-        try:
-            model_info = api.model_info(model_name)
-        except huggingface_hub.utils._errors.RepositoryNotFoundError:
-            print("Repo not found!", model_name)
-            model_data[AutoEvalColumn.license.name] = "?"
-            model_data[AutoEvalColumn.likes.name] = 0
-            model_data[AutoEvalColumn.params.name] = get_model_size(model_name, None)
-            continue
->>>>>>> 6e79cea283b9033350b77806ca64c34a2e0cd323
 
         model_data[AutoEvalColumn.license.name] = get_model_license(model_info)
         model_data[AutoEvalColumn.likes.name] = get_model_likes(model_info)