diff --git a/css/main.css b/css/main.css
index e73c5d5d..bda47da9 100644
--- a/css/main.css
+++ b/css/main.css
@@ -42,10 +42,13 @@ div, span, a, ul, li, textarea, input, button {
 .input-prepend .add-on
  {
     border: 1px solid #ebebeb !important;
+<<<<<<< HEAD
 }
 
 input.error {
     border-color: #ee5f5b !important; 
+=======
+>>>>>>> branch 'gh-pages' of https://github.com/benweet/stackedit.git
 }
 
 .navbar-inner .btn {
diff --git a/index.html b/index.html
index 85bafa3f..05a59545 100644
--- a/index.html
+++ b/index.html
@@ -47,7 +47,11 @@
 						<li class="dropdown-submenu"><a href="#"><i
 								class="icon-gdrive"></i> Google Drive</a>
 							<ul class="dropdown-menu">
+<<<<<<< HEAD
 								<li><a href="#" class="action-upload-gdrive">Export to
+=======
+								<li><a class="action-upload-gdrive" href="#">Export to
+>>>>>>> branch 'gh-pages' of https://github.com/benweet/stackedit.git
 										Google Drive</a></li>
 								<li><a href="#" data-toggle="modal"
 									data-target="#modal-download-gdrive">Import from Google
@@ -149,7 +153,11 @@
 					<a class="btn action-manual-gdrive" data-dismiss="modal"><i class="icon-ok"></i></a>
 			</div>
 			<p class="muted"><b>NOTE:</b> 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.</p>
 		</div>
 		<div class="modal-footer">
@@ -222,6 +230,7 @@
 				<dd>
 			</dl>
 			<dl>
+<<<<<<< HEAD
 				<dt>Credit:</dt>
                 <dd>
                     <a target="_blank" href="http://twitter.github.com/bootstrap/">Bootstrap</a>
@@ -244,6 +253,27 @@
                 </dd>
 				<dd>
 					<a target="_blank" href="http://requirejs.org/">RequireJS</a>
+=======
+				<dt>Credits:</dt>
+				<dd>
+					<a target="_blank" href="http://jquery.com/">jQuery</a>
+				</dd>
+				<dd>
+					<a target="_blank" href="http://twitter.github.com/bootstrap/">Bootstrap</a>
+				</dd>
+				<dd>
+					<a target="_blank" href="http://requirejs.org/">RequireJS</a>
+				</dd>
+				<dd>
+					<a target="_blank" href="https://code.google.com/p/pagedown/">PageDown</a>
+				</dd>
+				<dd>
+					<a target="_blank" href="http://layout.jquery-dev.net/">UI
+						Layout</a>
+				</dd>
+				<dd>
+					<a target="_blank" href="https://github.com/stanlemon/jGrowl/">jGrowl</a>
+>>>>>>> branch 'gh-pages' of https://github.com/benweet/stackedit.git
 				</dd>
 			</dl>
 			<p>Copyright 2013 <a target="_blank"