diff --git a/litellm/__init__.py b/litellm/__init__.py
index 3073f271969..e61ee1f59a3 100644
--- a/litellm/__init__.py
+++ b/litellm/__init__.py
@@ -260,11 +260,8 @@ from .utils import (
     completion_cost,
     get_litellm_params,
     Logging,
-<<<<<<< HEAD
     acreate,
     get_model_list
-=======
->>>>>>> 878f1a6 (formatting fixes)
 )
 from .main import *  # type: ignore
 from .integrations import *