diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index 65ecc9757..d6b30d05b 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -19,7 +19,7 @@
  - Fixed a trash purging problem.
  - fix [ 1281516 ] Undefined subroutine &WebGUI::Asset::File::quote runHourly
  - fix [ 1281430 ] www_restoreList should be in AssetTrash.pm
-
+ - fix help links on the Asset add/edit forms
 
 
 6.7.3
@@ -28,6 +28,9 @@
    and karma were not showing up when editing users.
  - fix [ 1274239 ] Can Not Save Edits to Assets
  - fix [ 1274414 ] extraHeadTags entirely unused (mwilson)
+<<<<<<< 6.x.x.txt
+ - fix [ 1265709 ] 6.7.1 - most help topics appear twice
+=======
  - fix [ 1276625 ] viewRSS not working (Andrew Khmelev)
  - fix [ 1276695 ] Addition to 'viewRSS not working' (6.7.2) (Andrew Khmelev)
  - Fixed a layout problem with the user search form.
@@ -47,6 +50,7 @@
  - fix [ 1279157 ] showInForms option not stored
  - fix [ 1250290 ] ECommerce state field broken on Plainblack.com
  - fix [ 1261985 ] (Fix?) sortby.lastreply.url (Andreas Graf)
+>>>>>>> 1.474
 
 
 6.7.2
diff --git a/lib/WebGUI/Asset/Event.pm b/lib/WebGUI/Asset/Event.pm
index 95da9b80a..fb2b921dd 100644
--- a/lib/WebGUI/Asset/Event.pm
+++ b/lib/WebGUI/Asset/Event.pm
@@ -447,7 +447,7 @@ sub www_deleteEventConfirm {
 sub www_edit {
 	my $self = shift;
 	return WebGUI::Privilege::insufficient() unless $self->canEdit;
-	$self->getAdminConsole->setHelp("event add/edit","EventsCalendar");
+	$self->getAdminConsole->setHelp("event add/edit","Asset_Event");
 	return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get('13', 'Asset_Event'));
 }
 
diff --git a/lib/WebGUI/Asset/File.pm b/lib/WebGUI/Asset/File.pm
index 8666f5abd..913b9384e 100644
--- a/lib/WebGUI/Asset/File.pm
+++ b/lib/WebGUI/Asset/File.pm
@@ -274,7 +274,7 @@ sub www_edit {
 		-value=>$self->getValue("templateId"),
 		-namespace=>"FileAsset"
 		);
-        $self->getAdminConsole->setHelp("file add/edit", "File");
+        $self->getAdminConsole->setHelp("file add/edit", "Asset_File");
         return $self->getAdminConsole->render($tabform->print,"Edit File");
 }
 
diff --git a/lib/WebGUI/Asset/Redirect.pm b/lib/WebGUI/Asset/Redirect.pm
index 25d8c9190..550002e92 100644
--- a/lib/WebGUI/Asset/Redirect.pm
+++ b/lib/WebGUI/Asset/Redirect.pm
@@ -102,7 +102,7 @@ sub getEditForm {
 sub www_edit {
         my $self = shift;
         return WebGUI::Privilege::insufficient() unless $self->canEdit;
-        $self->getAdminConsole->setHelp("redirect add/edit", "Redirect");
+        $self->getAdminConsole->setHelp("redirect add/edit", "Asset_Redirect");
         return $self->getAdminConsole->render($self->getEditForm->print,"Edit Redirect");
 }
 
diff --git a/lib/WebGUI/Asset/Shortcut.pm b/lib/WebGUI/Asset/Shortcut.pm
index 1062b7c9d..2f7f97a44 100644
--- a/lib/WebGUI/Asset/Shortcut.pm
+++ b/lib/WebGUI/Asset/Shortcut.pm
@@ -366,7 +366,7 @@ sub view {
 sub www_edit {
         my $self = shift;
         return WebGUI::Privilege::insufficient() unless $self->canEdit;
-	$self->getAdminConsole->setHelp("shortcut add/edit","Shortcut");
+	$self->getAdminConsole->setHelp("shortcut add/edit","Asset_Shortcut");
         return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get(2,"Asset_Shortcut"));
 }
 
diff --git a/lib/WebGUI/Asset/Snippet.pm b/lib/WebGUI/Asset/Snippet.pm
index 201adfdbf..a55bce54a 100644
--- a/lib/WebGUI/Asset/Snippet.pm
+++ b/lib/WebGUI/Asset/Snippet.pm
@@ -158,7 +158,7 @@ sub view {
 sub www_edit {
         my $self = shift;
         return WebGUI::Privilege::insufficient() unless $self->canEdit;
-        $self->getAdminConsole->setHelp("snippet add/edit","Snippet");
+        $self->getAdminConsole->setHelp("snippet add/edit","Asset_Snippet");
         return $self->getAdminConsole->render($self->getEditForm->print,"Edit Snippet");
 }
 
diff --git a/lib/WebGUI/Asset/Template.pm b/lib/WebGUI/Asset/Template.pm
index 1cd9d136f..64e0470ea 100644
--- a/lib/WebGUI/Asset/Template.pm
+++ b/lib/WebGUI/Asset/Template.pm
@@ -319,7 +319,7 @@ sub view {
 sub www_edit {
         my $self = shift;
         return WebGUI::Privilege::insufficient() unless $self->canEdit;
-	$self->getAdminConsole->setHelp("template add/edit","Template");
+	$self->getAdminConsole->setHelp("template add/edit","Asset_Template");
         return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get('edit template', 'Asset_Template'));
 }
 
diff --git a/lib/WebGUI/Asset/Wobject/Article.pm b/lib/WebGUI/Asset/Wobject/Article.pm
index 56c9693fd..d0d2b0c77 100644
--- a/lib/WebGUI/Asset/Wobject/Article.pm
+++ b/lib/WebGUI/Asset/Wobject/Article.pm
@@ -174,7 +174,7 @@ sub view {
 sub www_edit {
         my $self = shift;
 	return WebGUI::Privilege::insufficient() unless $self->canEdit;
-	$self->getAdminConsole->setHelp("article add/edit","Article");
+	$self->getAdminConsole->setHelp("article add/edit","Asset_Article");
         return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get("12","Asset_Article"));
 }
 
diff --git a/lib/WebGUI/Asset/Wobject/Collaboration.pm b/lib/WebGUI/Asset/Wobject/Collaboration.pm
index 9c16cb708..ce9c524d4 100644
--- a/lib/WebGUI/Asset/Wobject/Collaboration.pm
+++ b/lib/WebGUI/Asset/Wobject/Collaboration.pm
@@ -920,7 +920,7 @@ sub view {
 sub www_edit {
         my $self = shift;
 	return WebGUI::Privilege::insufficient() unless $self->canEdit;
-#	$self->getAdminConsole->setHelp("user submission system add/edit");
+	$self->getAdminConsole->setHelp("collaboration add/edit", "Asset_Collaboration");
         return $self->getAdminConsole->render($self->getEditForm->print,"Edit Collaboration System");
 }
 
diff --git a/lib/WebGUI/Asset/Wobject/DataForm.pm b/lib/WebGUI/Asset/Wobject/DataForm.pm
index 7bdc04ae4..047ea15d7 100644
--- a/lib/WebGUI/Asset/Wobject/DataForm.pm
+++ b/lib/WebGUI/Asset/Wobject/DataForm.pm
@@ -742,7 +742,7 @@ sub www_deleteTabConfirm {
 sub www_edit {
         my $self = shift;
 	return WebGUI::Privilege::insufficient() unless $self->canEdit;
-	$self->getAdminConsole->setHelp("data form add/edit","DataForm");
+	$self->getAdminConsole->setHelp("data form add/edit","Asset_DataForm");
         return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get("7","Asset_DataForm"));
 }
 
@@ -872,7 +872,7 @@ sub www_editField {
 	}
         $f->submit;
 	my $ac = $self->getAdminConsole;
-	$ac->setHelp("data form fields add/edit","DataForm");
+	$ac->setHelp("data form fields add/edit","Asset_DataForm");
         return $ac->render($f->print,WebGUI::International::get('20',"Asset_DataForm"));
 }
 
@@ -953,7 +953,7 @@ sub www_editTab {
 	}
         $f->submit;
 	my $ac = $self->getAdminConsole;
-	$ac->setHelp("data form fields add/edit","DataForm");
+	$ac->setHelp("data form fields add/edit","Asset_DataForm");
         return $ac->render($f->print,WebGUI::International::get('20',"Asset_DataForm"));
 }
 
diff --git a/lib/WebGUI/Asset/Wobject/EventsCalendar.pm b/lib/WebGUI/Asset/Wobject/EventsCalendar.pm
index c733e8180..22d5fc482 100644
--- a/lib/WebGUI/Asset/Wobject/EventsCalendar.pm
+++ b/lib/WebGUI/Asset/Wobject/EventsCalendar.pm
@@ -513,7 +513,7 @@ sub www_addStyledEvent {
 sub www_edit {
 	my $self = shift;
 	return WebGUI::Privilege::insufficient() unless $self->canEdit;
-	$self->getAdminConsole->setHelp("events calendar add/edit","EventsCalendar");
+	$self->getAdminConsole->setHelp("events calendar add/edit","Asset_EventsCalendar");
 	return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get("12","Asset_EventsCalendar"));
 }
 
diff --git a/lib/WebGUI/Asset/Wobject/Folder.pm b/lib/WebGUI/Asset/Wobject/Folder.pm
index b6259deef..b00745c53 100644
--- a/lib/WebGUI/Asset/Wobject/Folder.pm
+++ b/lib/WebGUI/Asset/Wobject/Folder.pm
@@ -151,7 +151,7 @@ sub view {
 sub www_edit {
         my $self = shift;
 	return WebGUI::Privilege::insufficient() unless $self->canEdit;
-        $self->getAdminConsole->setHelp("folder add/edit","Folder");
+        $self->getAdminConsole->setHelp("folder add/edit","Asset_Folder");
         return $self->getAdminConsole->render($self->getEditForm->print,"Edit Folder");
 }
 
diff --git a/lib/WebGUI/Asset/Wobject/HttpProxy.pm b/lib/WebGUI/Asset/Wobject/HttpProxy.pm
index 6d9f12820..5e9a3f5dd 100644
--- a/lib/WebGUI/Asset/Wobject/HttpProxy.pm
+++ b/lib/WebGUI/Asset/Wobject/HttpProxy.pm
@@ -344,7 +344,7 @@ sub view {
 sub www_edit {
         my $self = shift;
 	return WebGUI::Privilege::insufficient() unless $self->canEdit;
-	$self->getAdminConsole->setHelp("http proxy add/edit","HttpProxy");
+	$self->getAdminConsole->setHelp("http proxy add/edit","Asset_HttpProxy");
         return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get("2","Asset_HttpProxy"));
 }
 
diff --git a/lib/WebGUI/Asset/Wobject/IndexedSearch.pm b/lib/WebGUI/Asset/Wobject/IndexedSearch.pm
index f1dc349d5..ffeab4e0a 100644
--- a/lib/WebGUI/Asset/Wobject/IndexedSearch.pm
+++ b/lib/WebGUI/Asset/Wobject/IndexedSearch.pm
@@ -383,7 +383,7 @@ sub view {
 sub www_edit {
 	my $self = shift;
 	return WebGUI::Privilege::insufficient() unless $self->canEdit;
-	$self->getAdminConsole->setHelp("search add/edit");
+	$self->getAdminConsole->setHelp("search add/edit", "Asset_IndexedSearch");
 	my $form = $self->getEditForm;
 	my $output = $form;
 	$output = $form->print unless $form =~ /^<p><b/;
diff --git a/lib/WebGUI/Asset/Wobject/Layout.pm b/lib/WebGUI/Asset/Wobject/Layout.pm
index 52531e1dd..8e7501d6f 100644
--- a/lib/WebGUI/Asset/Wobject/Layout.pm
+++ b/lib/WebGUI/Asset/Wobject/Layout.pm
@@ -222,7 +222,7 @@ sub view {
 sub www_edit {
         my $self = shift;
 	return WebGUI::Privilege::insufficient() unless $self->canEdit;
-        $self->getAdminConsole->setHelp("layout add/edit", "Layout");
+        $self->getAdminConsole->setHelp("layout add/edit", "Asset_Layout");
         return $self->getAdminConsole->render($self->getEditForm->print,"Edit Layout");
 }
 
diff --git a/lib/WebGUI/Asset/Wobject/MessageBoard.pm b/lib/WebGUI/Asset/Wobject/MessageBoard.pm
index 5cadab23b..f5069c331 100644
--- a/lib/WebGUI/Asset/Wobject/MessageBoard.pm
+++ b/lib/WebGUI/Asset/Wobject/MessageBoard.pm
@@ -110,7 +110,7 @@ sub view {
 sub www_edit {
         my $self = shift;
 	return WebGUI::Privilege::insufficient() unless $self->canEdit;
-	$self->getAdminConsole->setHelp("message board add/edit","MessageBoard");
+	$self->getAdminConsole->setHelp("message board add/edit","Asset_MessageBoard");
         return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get("6","Asset_MessageBoard"));
 }
 
diff --git a/lib/WebGUI/Asset/Wobject/Navigation.pm b/lib/WebGUI/Asset/Wobject/Navigation.pm
index dcde9e5fa..1ea7f275c 100644
--- a/lib/WebGUI/Asset/Wobject/Navigation.pm
+++ b/lib/WebGUI/Asset/Wobject/Navigation.pm
@@ -447,7 +447,7 @@ sub view {
 sub www_edit {
         my $self = shift;
 	return WebGUI::Privilege::insufficient() unless $self->canEdit;
-	$self->getAdminConsole->setHelp("navigation add/edit","Navigation");
+	$self->getAdminConsole->setHelp("navigation add/edit","Asset_Navigation");
         return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get("22","Asset_Navigation"));
 }
 
diff --git a/lib/WebGUI/Asset/Wobject/Poll.pm b/lib/WebGUI/Asset/Wobject/Poll.pm
index 8f9534271..5f4d719d4 100644
--- a/lib/WebGUI/Asset/Wobject/Poll.pm
+++ b/lib/WebGUI/Asset/Wobject/Poll.pm
@@ -354,7 +354,7 @@ sub view {
 sub www_edit {
         my $self = shift;
 	return WebGUI::Privilege::insufficient() unless $self->canEdit;
-	$self->getAdminConsole->setHelp("poll add/edit","Poll");
+	$self->getAdminConsole->setHelp("poll add/edit","Asset_Poll");
         return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get("9","Asset_Poll"));
 }
 
diff --git a/lib/WebGUI/Asset/Wobject/Product.pm b/lib/WebGUI/Asset/Wobject/Product.pm
index 7b184ef6f..7e04cc894 100644
--- a/lib/WebGUI/Asset/Wobject/Product.pm
+++ b/lib/WebGUI/Asset/Wobject/Product.pm
@@ -462,7 +462,7 @@ sub www_deleteSpecificationConfirm {
 sub www_edit {
    my $self = shift;
    return WebGUI::Privilege::insufficient() unless $self->canEdit;
-   $self->getAdminConsole->setHelp("product add/edit","Product");
+   $self->getAdminConsole->setHelp("product add/edit","Asset_Product");
    return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get("6","Asset_Product"));
 }
 
diff --git a/lib/WebGUI/Asset/Wobject/SQLReport.pm b/lib/WebGUI/Asset/Wobject/SQLReport.pm
index 7814d206b..c8f59df12 100644
--- a/lib/WebGUI/Asset/Wobject/SQLReport.pm
+++ b/lib/WebGUI/Asset/Wobject/SQLReport.pm
@@ -257,7 +257,7 @@ sub view {
 sub www_edit {
         my $self = shift;
 	return WebGUI::Privilege::insufficient() unless $self->canEdit;
-	$self->getAdminConsole->setHelp("sql report add/edit", "SQLReport");
+	$self->getAdminConsole->setHelp("sql report add/edit", "Asset_SQLReport");
         return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get("8","Asset_SQLReport"));
 }
 
diff --git a/lib/WebGUI/Asset/Wobject/Survey.pm b/lib/WebGUI/Asset/Wobject/Survey.pm
index b8c303ace..d19527560 100644
--- a/lib/WebGUI/Asset/Wobject/Survey.pm
+++ b/lib/WebGUI/Asset/Wobject/Survey.pm
@@ -784,7 +784,7 @@ sub www_deleteAllResponsesConfirm {
 sub www_edit {
         my $self = shift;
 	return WebGUI::Privilege::insufficient() unless $self->canEdit;
-	$self->getAdminConsole->setHelp("survey add/edit","Survey");
+	$self->getAdminConsole->setHelp("survey add/edit","Asset_Survey");
 	return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get(2,'Asset_Survey'));
 }
 
@@ -873,7 +873,7 @@ sub www_editAnswer {
         }
         $f->submit;
 
-#	$self->getAdminConsole->setHelp("answer add/edit","Survey");
+#	$self->getAdminConsole->setHelp("answer add/edit","Asset_Survey");
 	return $self->getAdminConsole->render($f->print, WebGUI::International::get(18,'Asset_Survey'));
 
 }
@@ -1012,7 +1012,7 @@ sub www_editQuestion {
 		}
 		$sth->finish;
 	}
-	$self->getAdminConsole->setHelp("question add/edit","Survey");
+	$self->getAdminConsole->setHelp("question add/edit","Asset_Survey");
 	return $self->getAdminConsole->render($output, WebGUI::International::get(17,'Asset_Survey'));
 }
 
diff --git a/lib/WebGUI/Asset/Wobject/WSClient.pm b/lib/WebGUI/Asset/Wobject/WSClient.pm
index aac833ad7..dfc9fd20c 100644
--- a/lib/WebGUI/Asset/Wobject/WSClient.pm
+++ b/lib/WebGUI/Asset/Wobject/WSClient.pm
@@ -253,7 +253,7 @@ sub getEditForm {
 sub www_edit {
         my $self = shift;
 	return WebGUI::Privilege::insufficient() unless $self->canEdit;
-	$self->getAdminConsole->setHelp("web services client add/edit","WSClient");
+	$self->getAdminConsole->setHelp("web services client add/edit","Asset_WSClient");
         return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get("20","Asset_WSClient"));
 }