diff --git a/cache.manifest b/cache.manifest
index 05fe1765..bd4a1fed 100644
--- a/cache.manifest
+++ b/cache.manifest
@@ -1 +1 @@
-CACHE MANIFEST
# v7
CACHE:
index.html
css/bootstrap.css
css/jgrowl.css
css/main.css
js/prod/custo.js
js/async-runner.js
js/bootstrap.js
js/config.js
js/gdrive.js
js/jgrowl.js
js/jquery.js
js/jquery-ui.js
js/layout.js
js/main.js
js/Markdown.Converter.js
js/Markdown.Editor.js
js/Markdown.Sanitizer.js
js/require.js
js/synchronizer.js
img/ajax-loader.gif
img/dropbox.png
img/gdrive.png
img/glyphicons-halflings.png
img/glyphicons-halflings-white.png
img/stackedit-16.png
img/stackedit-32.ico
NETWORK:
*
+CACHE MANIFEST
# v8
CACHE:
index.html
css/bootstrap.css
css/jgrowl.css
css/main.css
js/prod/custo.js
js/async-runner.js
js/bootstrap.js
js/config.js
js/gdrive.js
js/jgrowl.js
js/jquery.js
js/jquery-ui.js
js/layout.js
js/main.js
js/Markdown.Converter.js
js/Markdown.Editor.js
js/Markdown.Sanitizer.js
js/require.js
js/synchronizer.js
img/ajax-loader.gif
img/dropbox.png
img/gdrive.png
img/glyphicons-halflings.png
img/glyphicons-halflings-white.png
img/stackedit-16.png
img/stackedit-32.ico
NETWORK:
*
diff --git a/index.html b/index.html
index 2525e22f..85bafa3f 100644
--- a/index.html
+++ b/index.html
@@ -149,11 +149,7 @@
NOTE: Adding a synchronized location will
-<<<<<<< HEAD
first upload the local document and overwrite the existing file on the
-=======
- first upload the local document and overwrite the file on the
->>>>>>> branch 'gh-pages' of https://github.com/benweet/stackedit.git
server.