diff --git a/_projectCommon.php b/_projectCommon.php
index ce23b32..879611d 100644
--- a/_projectCommon.php
+++ b/_projectCommon.php
@@ -13,11 +13,7 @@
 	
 	# Break the navigation into sections
 	$Nav->addNavSeparator("About Subversive", "http://www.eclipse.org/projects/project_summary.php?projectid=technology.subversive");
-<<<<<<< HEAD
 	$Nav->addNavSeparator("Subversive Home", "/subversive/index.php", "_self", 1);	
-=======
-	$Nav->addNavSeparator("Home", "/subversive/index.php", "_self", 1);	
->>>>>>> branch 'master' of ssh://ivinnykov@git.eclipse.org/gitroot/www.eclipse.org/subversive.git
 	
 	$Nav->addNavSeparator("Downloads", "/subversive/downloads.php", "_self");
 	$Nav->addCustomNav("Latest Releases", "/subversive/latest-releases.php", "_self", 1);
@@ -51,7 +47,7 @@
 	# top navigation bar
 	# To override and replace the navigation with your own, uncomment the line below.
 	$Menu->setMenuItemList(array());
-	$Menu->addMenuItem("Home", "/subversive/index.php", "_self");
+	$Menu->addMenuItem("Subversive Home", "/subversive/index.php", "_self");
 	$Menu->addMenuItem("Downloads", "/subversive/downloads.php", "_self");
 	$Menu->addMenuItem("Documentation", "/subversive/documentation.php", "_self");
 	$Menu->addMenuItem("Support", "/subversive/support.php", "_self");