Index: trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java	(revision 422)
+++ trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java	(revision 424)
@@ -52,5 +52,5 @@
 
 	public MergeNodesAction() {
-		super(tr("Merge Nodes"), "combineway", tr("Merge nodes into one."), KeyEvent.VK_M, KeyEvent.CTRL_MASK | KeyEvent.SHIFT_MASK, true);
+		super(tr("Merge Nodes"), "mergenodes", tr("Merge nodes into one."), KeyEvent.VK_M, KeyEvent.CTRL_MASK | KeyEvent.SHIFT_MASK, true);
 		DataSet.selListeners.add(this);
 	}
Index: trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java	(revision 422)
+++ trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java	(revision 424)
@@ -233,23 +233,25 @@
 		}
 		restoreCursor();
-    if (mode == Mode.move) {
-		  boolean ctrl = (e.getModifiers() & ActionEvent.CTRL_MASK) != 0;
-      if (ctrl) {
-		    Collection<OsmPrimitive> selection = Main.ds.getSelected();
-		    Collection<Node> affectedNodes = AllNodesVisitor.getAllNodes(selection);
-		    Collection<Node> nn = Main.map.mapView.getNearestNodes(e.getPoint(), affectedNodes);
-        if (nn != null) {
-          Node n = nn.iterator().next();
-          LinkedList<Node> selNodes = new LinkedList<Node>();
-          for (OsmPrimitive osm : selection)
-            if (osm instanceof Node)
-              selNodes.add((Node)osm);
-          if (selNodes.size() > 0) {
-            selNodes.add(n);
-            MergeNodesAction.mergeNodes(selNodes, n);
-          }
-        }
-      }
-    }
+
+		if (mode == Mode.move) {
+			boolean ctrl = (e.getModifiers() & ActionEvent.CTRL_MASK) != 0;
+			if (ctrl) {
+				Collection<OsmPrimitive> selection = Main.ds.getSelected();
+				Collection<Node> affectedNodes = AllNodesVisitor.getAllNodes(selection);
+				Collection<Node> nn = Main.map.mapView.getNearestNodes(e.getPoint(), affectedNodes);
+				if (nn != null) {
+					Node n = nn.iterator().next();
+				    LinkedList<Node> selNodes = new LinkedList<Node>();
+				    for (OsmPrimitive osm : selection)
+						if (osm instanceof Node)
+							selNodes.add((Node)osm);
+					if (selNodes.size() > 0) {
+						selNodes.add(n);
+						MergeNodesAction.mergeNodes(selNodes, n);
+					}
+				}
+			}
+		}
+
 		updateStatusLine();
 		mode = null;