diff --git a/UEFITool/uefitool.cpp b/UEFITool/uefitool.cpp
index ca34d32..f3c0a65 100644
--- a/UEFITool/uefitool.cpp
+++ b/UEFITool/uefitool.cpp
@@ -17,11 +17,7 @@
 UEFITool::UEFITool(QWidget *parent) :
 QMainWindow(parent),
 ui(new Ui::UEFITool),
-<<<<<<< HEAD
 version(tr("NE alpha 48"))
-=======
-version(tr("NE alpha 47"))
->>>>>>> 775ad7d25b97e266928f437af14b47d38578af63
 {
     clipboard = QApplication::clipboard();