Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 11462)
+++ trunk/data/defaultpresets.xml	(revision 11463)
@@ -9774,4 +9774,5 @@
             </optional>
             <optional text="Optional values for specific countries">
+                <text key="addr:unit" text="Unit/Suite" match="key" />
                 <text key="addr:housename" text="House name" match="key" alternative_autocomplete_keys="name" />
                 <text key="addr:hamlet" text="Hamlet" match="key" />
Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java	(revision 11462)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java	(revision 11463)
@@ -245,5 +245,5 @@
                     }
                     if (roles.size() != 1 || !isCollectionOfConsecutiveNumbers(indices)) {
-                        // roles to not patch or not consecutive members in relation, leave undecided
+                        // roles do not match or not consecutive members in relation, leave undecided
                         continue;
                     }