Index: trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java	(revision 18783)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java	(revision 18784)
@@ -537,5 +537,5 @@
                 }
             }
-                UndoRedoHandler.getInstance().add(new SequenceCommand(name, commands));
+            UndoRedoHandler.getInstance().add(new SequenceCommand(name, commands));
             refreshView();
         }