fixed merge conflicts
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 44050b9..7bd0c15 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -21,8 +21,6 @@
Release Notes for Cordova (WP8)
-Update these notes using: git log --pretty=format:'* %s' --topo-order --no-merges origin/2.7.x...HEAD
-
Cordova is a static library that enables developers to include the Cordova API in their WP8 application projects easily, and also create new Cordova-based WP8 application projects through the command-line.
### 3.8.0 (March 26, 2015)
@@ -64,8 +62,7 @@
* CB-7493 Adds `space-in-path` and `unicode in name` tests for `CI`
* cleanup ignores and add missing windows cmd files, if you want to add a `bundledDependency` `node_module` use `-f`
-### 3.6.4 (September 30, 2014) ###
-
+### 3.6.4 (September 30, 2014)
* Updated JS snapshot + set version to 3.6.4
* CB-7616 partial match support for --target
* CB-7616 Deploy on WP8 fails to run specific target
@@ -76,8 +73,7 @@
* Moves node_modules from package root to bin/ folder
* CB-7444 Fixes XHR callback failure when requested file doesn't exists
-### 3.6.0 (September 2, 2014) ###
-
+### 3.6.0 (September 2, 2014)
* updated package.json
* Update 3.6.x branch
* update package to 3.6.0-dev
@@ -141,8 +137,7 @@
* Apply app-hello-world update
-### 3.5.0 (201405XX) ###
-
+### 3.5.0 (201405XX)
* Apply app-hello-world update
* CB-6558: added package.json files for wp7 & wp8
* CB-6491 add CONTRIBUTING.md
@@ -170,8 +165,7 @@
* Update to 3.4.0-rc1
-### 3.4.0 (201402XX) ###
-
+### 3.4.0 (201402XX)
* Update to 3.4.0 proper
* CB-6041 createTemplates should install them for VS-2013 as well
* CB-5951 Added namespace to config.xml
diff --git a/package.json b/package.json
index 84e49a8..b2b8b6a 100644
--- a/package.json
+++ b/package.json
@@ -41,4 +41,4 @@
},
"author": "Apache Software Foundation",
"license": "Apache Version 2.0"
-}
\ No newline at end of file
+}
diff --git a/template/www/cordova.js b/template/www/cordova.js
index 54032be..bb0d061 100644
--- a/template/www/cordova.js
+++ b/template/www/cordova.js
@@ -19,7 +19,7 @@
under the License.
*/
;(function() {
-var PLATFORM_VERSION_BUILD_LABEL = '3.8.0';
+var PLATFORM_VERSION_BUILD_LABEL = '3.9.0-dev';
// file: src/scripts/require.js
/*jshint -W079 */
