Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java	(revision 18071)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java	(revision 18072)
@@ -307,5 +307,5 @@
      */
     public final void actOnDecisions(BiConsumer<String, MultiValueResolutionDecision> action) {
-        decisions.forEach(action::accept);
+        decisions.forEach(action);
     }
 }
Index: trunk/src/org/openstreetmap/josm/tools/Utils.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/Utils.java	(revision 18071)
+++ trunk/src/org/openstreetmap/josm/tools/Utils.java	(revision 18072)
@@ -670,4 +670,5 @@
      *     How to Prevent Your Java Collections From Wasting Memory</a>
      */
+    @SuppressWarnings("unchecked")
     public static <K, V> Map<K, V> toUnmodifiableMap(Map<K, V> map) {
         if (map == null || map.isEmpty()) {