Index: src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java
===================================================================
--- src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java	(revision 17273)
+++ src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java	(working copy)
@@ -463,7 +463,7 @@
 
     @Override
     public void decideRemaining(MergeDecisionType decision) {
-        if (!model.isDecidedCoord()) {
+        if (!model.isDecidedDeletedState()) {
             model.decideDeletedStateConflict(decision);
         }
         if (!model.isDecidedCoord()) {
Index: src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
===================================================================
--- src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java	(revision 17273)
+++ src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java	(working copy)
@@ -509,12 +509,12 @@
 
         @Override
         public void actionPerformed(ActionEvent e) {
-            final ConflictResolver resolver = new ConflictResolver();
             final List<Command> commands = new ArrayList<>();
             synchronized (this) {
                 for (OsmPrimitive osmPrimitive : lstConflicts.getSelectedValuesList()) {
                     Conflict<? extends OsmPrimitive> c = conflicts.getConflictForMy(osmPrimitive);
                     if (c != null) {
+                        final ConflictResolver resolver = new ConflictResolver();
                         resolver.populate(c);
                         resolver.decideRemaining(type);
                         Command cmd = resolver.buildResolveCommand();