Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java	(revision 7609)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java	(revision 7610)
@@ -85,5 +85,5 @@
      *
      */
-    protected void rebuild() {
+    public void rebuild() {
         if (tags == null) return;
         for(String key: tags.getKeys()) {