Index: trunk/src/org/openstreetmap/josm/command/conflict/ModifiedConflictResolveCommand.java
===================================================================
--- trunk/src/org/openstreetmap/josm/command/conflict/ModifiedConflictResolveCommand.java	(revision 15442)
+++ trunk/src/org/openstreetmap/josm/command/conflict/ModifiedConflictResolveCommand.java	(revision 15444)
@@ -53,5 +53,6 @@
     public boolean executeCommand() {
         super.executeCommand();
-        if (!conflict.getMy().isNew() && conflict.getMy().hasEqualSemanticAttributes(conflict.getTheir())) {
+        if (!conflict.getMy().isNew() && !conflict.getMy().isDeleted()
+                && conflict.getMy().hasEqualSemanticAttributes(conflict.getTheir())) {
             conflict.getMy().setModified(conflict.getTheir().isModified());
         }
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java	(revision 15442)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java	(revision 15444)
@@ -323,5 +323,5 @@
     @Override
     public void onConflictsRemoved(ConflictCollection conflicts) {
-        Logging.info("1 conflict has been resolved.");
+        Logging.debug("1 conflict has been resolved.");
         refreshView();
     }