From 488633d6f2dcc4e1fa112541814c64da21ebbdc9 Mon Sep 17 00:00:00 2001
From: rnwang04 <ruonan1.wang@intel.com>
Date: Mon, 2 Dec 2024 11:07:31 +0800
Subject: [PATCH] fix

---
 python/llm/src/ipex_llm/transformers/npu_models/convert.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/python/llm/src/ipex_llm/transformers/npu_models/convert.py b/python/llm/src/ipex_llm/transformers/npu_models/convert.py
index c8d51e4d738..ddfb835e032 100644
--- a/python/llm/src/ipex_llm/transformers/npu_models/convert.py
+++ b/python/llm/src/ipex_llm/transformers/npu_models/convert.py
@@ -19,15 +19,11 @@
 import torch
 import importlib
 from ipex_llm.transformers.npu_models.linear import QuantizedLinear
-<<<<<<< HEAD
-import tempfile
 import time
 from typing import Callable, List, Optional
 from transformers import GenerationConfig, \
     LogitsProcessorList, StoppingCriteriaList
-=======
 from ipex_llm.transformers.utils import module_name_process
->>>>>>> f2eea036b1 (init commit)
 
 
 def module_optimization(func) -> torch.nn.Module: