Index: trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java	(revision 12498)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java	(revision 12499)
@@ -121,7 +121,7 @@
      */
     private void build() {
-        model = new ConflictListModel();
-
         synchronized (this) {
+            model = new ConflictListModel();
+
             lstConflicts = new JList<>(model);
             lstConflicts.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);