diff --git a/ios/Classes/Api/MOP_initialize.m b/ios/Classes/Api/MOP_initialize.m
index a1bbd02..d267c90 100644
--- a/ios/Classes/Api/MOP_initialize.m
+++ b/ios/Classes/Api/MOP_initialize.m
@@ -9,12 +9,8 @@
 #import <FinApplet/FinApplet.h>
 //#import <FinAppletExt/FinAppletExt.h>
 #import "FinAppletExt.h"
-<<<<<<< HEAD
 //#import <FinAppletClipBoard/FinAppletClipBoard.h>
-=======
-#import <FinAppletClipBoard/FinAppletClipBoard.h>
 #import <FinAppletBLE/FinAppletBLE.h>
->>>>>>> 52e29a405e7ec23920852d84766efd035191edc2
 #import "MOPTools.h"
 
 @implementation MOP_initialize