diff --git a/configure.ac b/configure.ac
index 6a9067389..fda72f9fc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,7 +10,7 @@ AC_PREREQ(2.52)
 dnl Initialize the automake stuff
 dnl set the $host variable based on local machine/os
 AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE(FlightGear, 2.0.0-rc2)
+AM_INIT_AUTOMAKE(FlightGear, 2.0.0)
 
 dnl Checks for programs.
 AC_PROG_MAKE_SET
diff --git a/src/Include/config.h-msvc6 b/src/Include/config.h-msvc6
index 1b7f8ddc6..67470ea81 100644
--- a/src/Include/config.h-msvc6
+++ b/src/Include/config.h-msvc6
@@ -46,7 +46,11 @@
 #define PACKAGE "FlightGear"
 
 /* Define to package version - use in main.cxx */
+<<<<<<< config.h-msvc6
+#define FLIGHTGEAR_VERSION "MSVC6-WIN32-2.0.0-rc2"
+=======
 #define FLIGHTGEAR_VERSION "MSVC6-WIN32-2.0.0"
+>>>>>>> 1.13
 
 /* Define as the return type of signal handlers (int or void).  */
 #define RETSIGTYPE void
@@ -64,7 +68,11 @@
 #define TM_IN_SYS_TIME 1
 
 /* Define to version number */
+<<<<<<< config.h-msvc6
+#define VERSION "2.0.0-rc2"
+=======
 #define VERSION "2.0.0"
+>>>>>>> 1.13
 
 /* Define if compiling on a Winbloze (95, NT, etc.) platform */
 #define WIN32 1
diff --git a/src/Include/config.h-msvc71 b/src/Include/config.h-msvc71
index 0e7fc3835..5d758a284 100755
--- a/src/Include/config.h-msvc71
+++ b/src/Include/config.h-msvc71
@@ -19,7 +19,11 @@
 #define PACKAGE "FlightGear"
 
 /* Define to package version - use in main.cxx */
+<<<<<<< config.h-msvc71
+#define FLIGHTGEAR_VERSION "MSVC7.1-WIN32-2.0.0-rc2"
+=======
 #define FLIGHTGEAR_VERSION "MSVC7.1-WIN32-2.0.0"
+>>>>>>> 1.7
 
 /* Define as the return type of signal handlers (int or void).  */
 #define RETSIGTYPE void
@@ -37,7 +41,11 @@
 #define TM_IN_SYS_TIME 1
 
 /* Define to version number */
+<<<<<<< config.h-msvc71
+#define VERSION "2.0.0-rc2"
+=======
 #define VERSION "2.0.0"
+>>>>>>> 1.7
 #ifndef  FG_VERSION     /* allow override */
 #define  FG_VERSION     7
 #endif   /* FG_VERSION */
diff --git a/src/Include/config.h-msvc8 b/src/Include/config.h-msvc8
index fd8ce66b9..ad0a421b0 100755
--- a/src/Include/config.h-msvc8
+++ b/src/Include/config.h-msvc8
@@ -50,7 +50,11 @@
 #define PACKAGE "FlightGear"
 
 /* Define to package version - use in main.cxx */
+<<<<<<< config.h-msvc8
+#define FLIGHTGEAR_VERSION "MSVC8-WIN32-2.0.0-rc2"
+=======
 #define FLIGHTGEAR_VERSION "MSVC8-WIN32-2.0.0"
+>>>>>>> 1.14
 
 /* Define as the return type of signal handlers (int or void).  */
 #define RETSIGTYPE void
@@ -68,7 +72,11 @@
 #define TM_IN_SYS_TIME 1
 
 /* Define to version number */
+<<<<<<< config.h-msvc8
+#define VERSION "2.0.0-rc2"
+=======
 #define VERSION "2.0.0"
+>>>>>>> 1.14
 
 /* Define if compiling on a Winbloze (95, NT, etc.) platform */
 #define WIN32 1