Index: trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeModelTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeModelTest.java	(revision 2641)
+++ trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeModelTest.java	(revision 2676)
@@ -19,9 +19,4 @@
 
     @Test
-    public void TagMergeModel() {
-        TagMergeModel model = new TagMergeModel();
-    }
-
-    @Test
     public void addPropertyChangeListener() {
         TagMergeModel model = new TagMergeModel();
@@ -33,5 +28,5 @@
         model.addPropertyChangeListener(listener);
 
-        ArrayList list = field("listeners").ofType(ArrayList.class)
+        ArrayList<?> list = field("listeners").ofType(ArrayList.class)
         .in(model)
         .get();
@@ -52,5 +47,5 @@
         model.removePropertyChangeListener(listener);
 
-        ArrayList list = field("listeners")
+        ArrayList<?> list = field("listeners")
         .ofType(ArrayList.class)
         .in(model)