diff --git a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileXmlUtil.java b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileXmlUtil.java
index e88e126f4..d84d95d2f 100644
--- a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileXmlUtil.java
+++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileXmlUtil.java
@@ -85,13 +85,8 @@ public class PublicPersonalProfileXmlUtil {
                 navHome.addAttribute("isSelected", "false");
             }
             navHome.addAttribute("sortKey", "");
-<<<<<<< .mine
-            String homeLabel = homeLabels.get(DispatcherHelper.getNegotiatedLocale().
-=======
-            String homeLabel = homeLabels.get(GlobalizationHelper.
-                    getNegotiatedLocale().
->>>>>>> .r1165
-                    getLanguage());
+
+            String homeLabel = homeLabels.get(GlobalizationHelper.getNegotiatedLocale().getLanguage());
             if (homeLabel == null) {
                 navHome.addAttribute("title", "Home");
             } else {