Index: trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolutionUtilTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolutionUtilTest.java	(revision 16162)
+++ trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolutionUtilTest.java	(revision 16164)
@@ -36,6 +36,5 @@
     public JOSMTestRules test = new JOSMTestRules();
 
-    @SafeVarargs
-    private static <T> HashSet<T> newHashSet(T... values) {
+    private static HashSet<String> newHashSet(String... values) {
         return Arrays.stream(values).collect(Collectors.toCollection(HashSet::new));
     }
@@ -387,5 +386,5 @@
             assertEquals(group1.key, choiceKey1Group1.key);
             assertEquals(group1.group, choiceKey1Group1.group);
-            assertEquals(new HashSet<>(group1.choices), newHashSet(choiceKey1Group1, choiceKey1Group1bis));
+            assertEquals(new HashSet<>(group1.choices), new HashSet<>(Arrays.asList(choiceKey1Group1, choiceKey1Group1bis)));
 
             groups = AutomaticChoiceGroup.groupChoices(Arrays.asList(