diff --git a/multibootusb b/multibootusb
index 2d4a633..76b8096 100644
--- a/multibootusb
+++ b/multibootusb
@@ -5,11 +5,7 @@
 # Authors:  Sundar
 # Licence:  This file is a part of multibootusb package. You can redistribute it or modify
 #           under the terms of GNU General Public License, version 2 or above.
-
-<<<<<<< HEAD
 import os
-=======
->>>>>>> devel
 import getopt
 import sys
 import platform