diff --git a/paddlex/interpret/__init__.py b/paddlex/interpret/__init__.py
index ca2695b1daa7aa4b876ccec751f990212175af5e..55c92c92a32c3fa6e34497e2d70589f63b180956 100644
--- a/paddlex/interpret/__init__.py
+++ b/paddlex/interpret/__init__.py
@@ -16,8 +16,4 @@ from __future__ import absolute_import
 from . import visualize
 
 lime = visualize.lime
-<<<<<<< HEAD
 normlime = visualize.normlime
-=======
-normlime = visualize.normlime
->>>>>>> 092ff478a435193ca13c62b37c5374788e48e142