diff --git a/LICENSE b/LICENSE
index ea30c83..341176f 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 MIT License
 
 Copyright (c) 2018 Naim A.