diff --git a/modules/core/client/views/home.client.view.html b/modules/core/client/views/home.client.view.html
index 55e6eb5a55..0da70d5525 100644
--- a/modules/core/client/views/home.client.view.html
+++ b/modules/core/client/views/home.client.view.html
@@ -54,11 +54,7 @@ <h2>
 			<h2>
 				<strong>E</strong>xpress
 			</h2>
-<<<<<<< HEAD:public/modules/core/views/home.client.view.html
 			<p><a target="_blank" href="http://expressjs.com/"> Express</a> is an app server. Check out <a target="_blank" href="http://expressjs.com/4x/api.html">The ExpressJS API reference for more information</a> or <a target="_blank" href="http://stackoverflow.com/questions/8144214/learning-express-for-node-js">StackOverflow</a> for more info.</p>
-=======
-			<p><a target="_blank" href="http://expressjs.com/"> Express</a> is an app server. Check out <a target="_blank" href="http://expressjs.com/guide.html">The Express Guide</a> or <a target="_blank" href="http://stackoverflow.com/questions/8144214/learning-express-for-node-js">StackOverflow</a> for more info.</p>
->>>>>>> 0.4.0:modules/core/client/views/home.client.view.html
 		</div>
 		<div class="col-md-3">
 			<h2>