Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java	(revision 10666)
+++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java	(revision 10667)
@@ -928,4 +928,5 @@
     }
 
+    @Override
     public void decideRemaining(MergeDecisionType decision) {
         if (!model.isFrozen()) {