Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java	(revision 1691)
+++ trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java	(revision 1692)
@@ -246,7 +246,11 @@
                     merged.put(other, my);
                 } else if (! my.modified && !other.modified) {
-                    // nothing to merge
+                    // both not modified. Keep mine
                     //
                     merged.put(other,my);
+                } else if (my.modified && ! other.modified && my.version == other.version) {
+                    // my is same as other but mine is modified
+                    // => keep mine
+                    merged.put(other, my);
                 } else if (my.deleted != other.deleted) {
                     // if we get here my is modified. Differences in deleted state
Index: trunk/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java	(revision 1691)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java	(revision 1692)
@@ -337,5 +337,5 @@
         if (myCoords != null && theirCoords == null) return true;
         if (myCoords == null && theirCoords == null) return false;
-        return !myCoords.equalsEpsilon(theirCoords);
+        return !myCoords.equals(theirCoords);
     }