diff --git a/instructor/distil.py b/instructor/distil.py
index d522489..894a803 100644
--- a/instructor/distil.py
+++ b/instructor/distil.py
@@ -4,21 +4,12 @@ import inspect
 import json
 import logging
 
-<<<<<<< HEAD
 from typing import Any, Callable, List, Optional
-import uuid
-from pydantic import BaseModel, validate_call
-
-=======
-from typing import Any, Callable, List, Optional, Type
 from pydantic import BaseModel, validate_call
 
 import uuid
 import openai
 
->>>>>>> distil
-from instructor import openai_schema
-
 
 class FinetuneFormat(enum.Enum):
     MESSAGES: str = "messages"