Index: /trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java	(revision 2725)
+++ /trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java	(revision 2726)
@@ -126,5 +126,5 @@
                 + "The default is to <strong>keep</strong> the first way and <strong>remove</strong> "
                 + "the other ways that are members of the same relation: the combined way will "
-                + "take the place of the original way in the membership."
+                + "take the place of the original way in the relation."
                 + "</html>"));
         invalidate();
@@ -137,5 +137,5 @@
                 + "The default is to <strong>keep</strong> the first node and <strong>remove</strong> "
                 + "the other nodes that are members of the same relation: the target node will "
-                + "take the place of the original node in the membership."
+                + "take the place of the original node in the relation."
                 + "</html>"));
         invalidate();