Index: /applications/editors/josm/plugins/contourmerge/build.xml
===================================================================
--- /applications/editors/josm/plugins/contourmerge/build.xml	(revision 25378)
+++ /applications/editors/josm/plugins/contourmerge/build.xml	(revision 25379)
@@ -27,5 +27,5 @@
 <project name="contourmerge" default="dist" basedir=".">
 
-	<property name="commit.message" value="Updating to JOSM 3210" />
+	<property name="commit.message" value="Fixed: unexpected intersections after drag-and-drop" />
 	<property name="plugin.main.version" value="3835" />
 
@@ -74,5 +74,5 @@
 		<copy todir="${plugin.build.dir}/images">
 			<fileset dir="images">
-				<exclude name="*.svg" />
+				<include name="*.png" />
 			</fileset>
 		</copy>
Index: /applications/editors/josm/plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java
===================================================================
--- /applications/editors/josm/plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java	(revision 25378)
+++ /applications/editors/josm/plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java	(revision 25379)
@@ -398,4 +398,5 @@
 		List<Node> targetNodes = dropTarget.getNodes();
 		if (! areDirectionAligned(dragSource, dropTarget)) {
+			logger.info("not direction aligned !");
 			Collections.reverse(targetNodes);
 		}
@@ -421,5 +422,5 @@
 	 * {@code n2} are "direction aligned". Their direction is aligned, if the two lines
 	 * between the two start nodes and the two end nodes of {@code n1} and code {@code n2}
-	 * respectively, do not interesect.</p> 
+	 * respectively, do not intersect.</p> 
 	 * 
 	 * @param n1 the first list of nodes 
@@ -451,5 +452,5 @@
 		if (dragSource == null) return false;
 		if (dropTarget == null) return false;
-		return areDirectionAligned(dragSource.getWay().getNodes(), dropTarget.getWay().getNodes());
+		return areDirectionAligned(dragSource.getNodes(), dropTarget.getNodes());
 	}
 
Index: /applications/editors/josm/plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeView.java
===================================================================
--- /applications/editors/josm/plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeView.java	(revision 25378)
+++ /applications/editors/josm/plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeView.java	(revision 25379)
@@ -294,4 +294,5 @@
 			/*
 			 * paint the temporary dragged way slice, unless the mouse is currently over a potential
+			 * drop target
 			 */
 			Path2D polyline = project(mv, dragSource, model.getDragOffset());
@@ -305,5 +306,5 @@
 			 * the mouse is over a suitable drop target. Paint only 
 			 * two helper lines from the drag source to the drop target. The drop target
-			 * is highlighted. 
+			 * is highlighted elsewhere. 
 			 */
 			paintHelperLinesFromDragSourceToDropTarget(g,mv);