diff --git a/htroot/yacy/ui/index.html b/htroot/yacy/ui/index.html
index 867b359cd..e884fa0f9 100644
--- a/htroot/yacy/ui/index.html
+++ b/htroot/yacy/ui/index.html
@@ -194,13 +194,8 @@
         		},
         		Edit: function() {
 					data = {
-<<<<<<< .mine
 						"old": $("input[name='tag1']").getValue(),
 						"new": $("input[name='tag2']").getValue()
-=======
-						"old": $("input[@name='tag1']").getValue(),
-						"new": $("input[@name='tag2']").getValue()
->>>>>>> .r5596
 					};
 					$.ajax({
 						type: "GET",