Index: trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeModelTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeModelTest.java	(revision 3056)
+++ trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeModelTest.java	(revision 3095)
@@ -201,5 +201,4 @@
     public void decideMultiple() {
 
-        TagMergeItem item = new TagMergeItem("key", "myvalue", "theirvalue");
         TagMergeModel model = new TagMergeModel();
         for (int i=0; i < 10; i++) {
@@ -216,5 +215,5 @@
         model.decide(new int[] {0, 3, 5}, MergeDecisionType.KEEP_MINE);
         for (int i = 0; i< 10; i++) {
-            item = list.get(i);
+            TagMergeItem item = list.get(i);
             if (i == 0 || i == 3 || i == 5) {
                 assertEquals(MergeDecisionType.KEEP_MINE, item.getMergeDecision());