diff --git a/include/pgAdmin3.h b/include/pgAdmin3.h
index e30a97c..38ca34e 100644
--- a/include/pgAdmin3.h
+++ b/include/pgAdmin3.h
@@ -58,7 +58,6 @@
 // Supported server minimum and maximum values.
 const short SERVER_MIN_VERSION_N = 0x0804;
 const wxString SERVER_MIN_VERSION_T = wxT("8.4");
-<<<<<<< HEAD
 const short SERVER_MAX_VERSION_N = 0x0C00;
 const wxString SERVER_MAX_VERSION_T = wxT("12");
 // Supported Greenplum Database and Greenplum HAWQ minimum and maximum values.