diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp
index f9a9d241d..8ea5a2821 100644
--- a/widgets/mainwindow.cpp
+++ b/widgets/mainwindow.cpp
@@ -1034,7 +1034,6 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
 
 void MainWindow::not_GA_warning_message ()
 {
-<<<<<<< HEAD
   // MessageBox::critical_message (this,
   //                               "This is a pre-release version of WSJT-X 2.3.0 made\n"
   //                               "available for testing purposes.  By design it will\n"
@@ -1043,16 +1042,6 @@ void MainWindow::not_GA_warning_message ()
   // if (now >= QDateTime {{2021, 1, 19}, {0, 0}, Qt::UTC}) {
   //   Q_EMIT finished ();
   // }
-=======
-  MessageBox::critical_message (this,
-                                "This is a pre-release version of WSJT-X 2.3.0 made\n"
-                                "available for testing purposes.  By design it will\n"
-                                "be nonfunctional after 0000 UTC on Jan 26, 2021.");
-  auto now = QDateTime::currentDateTimeUtc ();
-  if (now >= QDateTime {{2021, 1, 26}, {0, 0}, Qt::UTC}) {
-    Q_EMIT finished ();
-  }
->>>>>>> master
 }
 
 void MainWindow::initialize_fonts ()