fix conflict detection

src/bk/ConflictDetection.java

@@ -176,7 +176,7 @@ public class ConflictDetection implements AlgorithmStage {
         ifNode = new PseudoCodeNode( TextLayoutHelper.setupPseudoCode( "if l1==|L[i+1]|-1 or L[i+1][l1] incident to inner segment between L[i+1] and L[i] then", vars ), tree, new IfLoop() {
 			@Override
 			protected boolean condition(Memory m) {
-	            return m.<LayeredGraphNode>read( "graph", MemoryType.LOCAL ).getContainedLayers().get( m.<Integer>read( "i", MemoryType.LOCAL ) + 1).size() == m.<Integer>read( "l1", MemoryType.LOCAL ) || 
+	            return m.<Integer>read( "l1", MemoryType.LOCAL ) == m.<LayeredGraphNode>read( "graph", MemoryType.LOCAL ).getContainedLayers().get( m.<Integer>read( "i", MemoryType.LOCAL ) + 1).size() - 1 || 
 	            		incidentToInnerSegmentBetweenLiPlusOneAndLi( m );
 			}
         } );
@@ -249,7 +249,7 @@ public class ConflictDetection implements AlgorithmStage {
         line = new PseudoCodeNode( TextLayoutHelper.setupPseudoCode( "k0 = k1;", vars ), tree, new SetVariable<Integer>( "k0" ) {
 			@Override
 			protected Integer value(Memory m) {
-				return (int)m.<Integer>read( "l1", MemoryType.LOCAL );
+				return (int)m.<Integer>read( "k1", MemoryType.LOCAL );
 			}
         } );
         ifNode.add( line );