Index: src/org/openstreetmap/josm/data/conflict/ConflictCollection.java
===================================================================
--- src/org/openstreetmap/josm/data/conflict/ConflictCollection.java	(revision 6111)
+++ src/org/openstreetmap/josm/data/conflict/ConflictCollection.java	(working copy)
@@ -37,7 +37,7 @@
     private CopyOnWriteArrayList<IConflictListener> listeners;
 
     public ConflictCollection() {
-        conflicts = new ArrayList<Conflict<?>>();
+        conflicts = new ArrayList<Conflict<? extends OsmPrimitive>>();
         listeners = new CopyOnWriteArrayList<IConflictListener>();
     }