Index: bug_files/TODO/merge.rp
===================================================================
--- bug_files/TODO/merge.rp	(nonexistent)
+++ bug_files/TODO/merge.rp	(revision 36823)
@@ -0,0 +1,970 @@
+ha:pcb-rnd-board-v6 {
+
+ li:styles {
+   ha:Signal {
+    diameter = 0.6mm
+    text_scale = 100
+    text_thick = 0.0
+    thickness = 0.15mm
+    hole = 0.3mm
+    clearance = 0.15mm
+   }
+   ha:Power {
+    diameter = 0.6mm
+    text_scale = 100
+    text_thick = 0.0
+    thickness = 0.3mm
+    hole = 0.3mm
+    clearance = 0.15mm
+   }
+   ha:Fat {
+    diameter = 0.6mm
+    text_scale = 100
+    text_thick = 0.0
+    thickness = 0.6mm
+    hole = 0.3mm
+    clearance = 0.15mm
+   }
+ }
+
+ ha:meta {
+   ha:size {
+    thermal_scale = 0.500000
+    x = 5.75mm
+    y = 4.3mm
+   }
+   ha:grid {
+    spacing = 0.05mm
+    offs_x = 0.0
+    offs_y = 0.0
+   }
+ }
+
+ ha:data {
+  li:padstack_prototypes {
+
+   ha:ps_proto_v6.0 {
+     hdia=0.3mm; hplated=1; htop=0; hbottom=0;
+     li:shape {
+
+       ha:ps_shape_v4 {
+        ha:ps_circ { x=0.0; y=0.0; dia=0.6mm;        }
+        ha:combining {        }
+        ha:layer_mask {
+         copper = 1
+         top = 1
+        }
+        clearance=0.0
+       }
+
+       ha:ps_shape_v4 {
+        ha:ps_circ { x=0.0; y=0.0; dia=0.6mm;        }
+        ha:combining {        }
+        ha:layer_mask {
+         bottom = 1
+         copper = 1
+        }
+        clearance=0.0
+       }
+
+       ha:ps_shape_v4 {
+        ha:ps_circ { x=0.0; y=0.0; dia=0.6mm;        }
+        ha:combining {        }
+        ha:layer_mask {
+         copper = 1
+         intern = 1
+        }
+        clearance=0.0
+       }
+     }
+   }
+
+   ha:ps_proto_v6.1 {
+     hdia=1.0mm; hplated=1; htop=0; hbottom=0;
+     li:shape {
+
+       ha:ps_shape_v4 {
+        ha:ps_circ { x=0.0; y=0.0; dia=2.2mm;        }
+        ha:combining {        }
+        ha:layer_mask {
+         copper = 1
+         top = 1
+        }
+        clearance=0.0
+       }
+
+       ha:ps_shape_v4 {
+        ha:ps_circ { x=0.0; y=0.0; dia=2.2mm;        }
+        ha:combining {        }
+        ha:layer_mask {
+         bottom = 1
+         copper = 1
+        }
+        clearance=0.0
+       }
+
+       ha:ps_shape_v4 {
+        ha:ps_circ { x=0.0; y=0.0; dia=2.2mm;        }
+        ha:combining {        }
+        ha:layer_mask {
+         copper = 1
+         intern = 1
+        }
+        clearance=0.0
+       }
+     }
+   }
+
+   ha:ps_proto_v6.2 {
+     hdia=47.24mil; hplated=1; htop=0; hbottom=0;
+     li:shape {
+
+       ha:ps_shape_v4 {
+        ha:ps_circ { x=0.0; y=0.0; dia=137.8mil;        }
+        ha:combining {        }
+        ha:layer_mask {
+         copper = 1
+         top = 1
+        }
+        clearance=0.0
+       }
+
+       ha:ps_shape_v4 {
+        ha:ps_circ { x=0.0; y=0.0; dia=137.8mil;        }
+        ha:combining {        }
+        ha:layer_mask {
+         bottom = 1
+         copper = 1
+        }
+        clearance=0.0
+       }
+
+       ha:ps_shape_v4 {
+        ha:ps_circ { x=0.0; y=0.0; dia=137.8mil;        }
+        ha:combining {        }
+        ha:layer_mask {
+         copper = 1
+         intern = 1
+        }
+        clearance=0.0
+       }
+     }
+   }
+
+   ha:ps_proto_v6.3 {
+     hdia=31.5mil; hplated=1; htop=0; hbottom=0;
+     li:shape {
+
+       ha:ps_shape_v4 {
+        ha:ps_circ { x=0.0; y=0.0; dia=64.0mil;        }
+        ha:combining {        }
+        ha:layer_mask {
+         copper = 1
+         top = 1
+        }
+        clearance=0.0
+       }
+
+       ha:ps_shape_v4 {
+        ha:ps_circ { x=0.0; y=0.0; dia=64.0mil;        }
+        ha:combining {        }
+        ha:layer_mask {
+         bottom = 1
+         copper = 1
+        }
+        clearance=0.0
+       }
+
+       ha:ps_shape_v4 {
+        ha:ps_circ { x=0.0; y=0.0; dia=64.0mil;        }
+        ha:combining {        }
+        ha:layer_mask {
+         copper = 1
+         intern = 1
+        }
+        clearance=0.0
+       }
+     }
+   }
+
+   ha:ps_proto_v6.4 {
+     hdia=0.0; hplated=0; htop=0; hbottom=0;
+     li:shape {
+
+       ha:ps_shape_v4 {
+        ha:combining {        }
+        ha:layer_mask {
+         copper = 1
+         top = 1
+        }
+        clearance=24.0mil
+         li:ps_poly {
+          -0.7mm  
+          -1.7mm  
+          0.8mm  
+          -1.7mm  
+          0.8mm  
+          1.7mm  
+          -0.7mm  
+          1.7mm  
+         }
+       }
+
+       ha:ps_shape_v4 {
+        ha:combining { auto=1;        }
+        ha:layer_mask {
+         top = 1
+         paste = 1
+        }
+        clearance=0.3mm
+         li:ps_poly {
+          -0.6mm  
+          -1.6mm  
+          0.7mm  
+          -1.6mm  
+          0.7mm  
+          1.6mm  
+          -0.6mm  
+          1.6mm  
+         }
+       }
+
+       ha:ps_shape_v4 {
+        ha:combining { sub=1; auto=1;        }
+        ha:layer_mask {
+         top = 1
+         mask = 1
+        }
+        clearance=0.3mm
+         li:ps_poly {
+          -0.9mm  
+          -74.80314961mil  
+          1.0mm  
+          -74.80314961mil  
+          1.0mm  
+          74.80314961mil  
+          -0.9mm  
+          74.80314961mil  
+         }
+       }
+     }
+   }
+
+   ha:ps_proto_v6.5 {
+     hdia=0.0; hplated=0; htop=0; hbottom=0;
+     li:shape {
+
+       ha:ps_shape_v4 {
+        ha:combining {        }
+        ha:layer_mask {
+         copper = 1
+         top = 1
+        }
+        clearance=24.0mil
+         li:ps_poly {
+          -0.7mm  
+          -1.7mm  
+          0.8mm  
+          -1.7mm  
+          0.8mm  
+          1.7mm  
+          -0.7mm  
+          1.7mm  
+         }
+       }
+
+       ha:ps_shape_v4 {
+        ha:combining { auto=1;        }
+        ha:layer_mask {
+         top = 1
+         paste = 1
+        }
+        clearance=0.3mm
+         li:ps_poly {
+          -0.6mm  
+          -1.6mm  
+          0.7mm  
+          -1.6mm  
+          0.7mm  
+          1.6mm  
+          -0.6mm  
+          1.6mm  
+         }
+       }
+
+       ha:ps_shape_v4 {
+        ha:combining { sub=1; auto=1;        }
+        ha:layer_mask {
+         top = 1
+         mask = 1
+        }
+        clearance=0.3mm
+         li:ps_poly {
+          -0.9mm  
+          74.80314961mil  
+          1.0mm  
+          74.80314961mil  
+          1.0mm  
+          -74.80314961mil  
+          -0.9mm  
+          -74.80314961mil  
+         }
+       }
+     }
+   }
+
+   ha:ps_proto_v6.6 {
+     hdia=0.0; hplated=0; htop=0; hbottom=0;
+     li:shape {
+
+       ha:ps_shape_v4 {
+        ha:combining {        }
+        ha:layer_mask {
+         copper = 1
+         top = 1
+        }
+        clearance=24.0mil
+         li:ps_poly {
+          -0.5mm  
+          -1.8mm  
+          0.5mm  
+          -1.8mm  
+          0.5mm  
+          1.7mm  
+          -0.5mm  
+          1.7mm  
+         }
+       }
+
+       ha:ps_shape_v4 {
+        ha:combining { auto=1;        }
+        ha:layer_mask {
+         top = 1
+         paste = 1
+        }
+        clearance=0.3mm
+         li:ps_poly {
+          -0.4mm  
+          -1.7mm  
+          0.4mm  
+          -1.7mm  
+          0.4mm  
+          1.6mm  
+          -0.4mm  
+          1.6mm  
+         }
+       }
+
+       ha:ps_shape_v4 {
+        ha:combining { sub=1; auto=1;        }
+        ha:layer_mask {
+         top = 1
+         mask = 1
+        }
+        clearance=0.3mm
+         li:ps_poly {
+          -0.7mm  
+          -2.0mm  
+          0.7mm  
+          -2.0mm  
+          0.7mm  
+          74.80314961mil  
+          -0.7mm  
+          74.80314961mil  
+         }
+       }
+     }
+   }
+
+   ha:ps_proto_v6.7 {
+     hdia=0.0; hplated=0; htop=0; hbottom=0;
+     li:shape {
+
+       ha:ps_shape_v4 {
+        ha:combining {        }
+        ha:layer_mask {
+         copper = 1
+         top = 1
+        }
+        clearance=24.0mil
+         li:ps_poly {
+          -0.5mm  
+          -1.8mm  
+          0.5mm  
+          -1.8mm  
+          0.5mm  
+          1.7mm  
+          -0.5mm  
+          1.7mm  
+         }
+       }
+
+       ha:ps_shape_v4 {
+        ha:combining { auto=1;        }
+        ha:layer_mask {
+         top = 1
+         paste = 1
+        }
+        clearance=0.3mm
+         li:ps_poly {
+          -0.4mm  
+          -1.7mm  
+          0.4mm  
+          -1.7mm  
+          0.4mm  
+          1.6mm  
+          -0.4mm  
+          1.6mm  
+         }
+       }
+
+       ha:ps_shape_v4 {
+        ha:combining { sub=1; auto=1;        }
+        ha:layer_mask {
+         top = 1
+         mask = 1
+        }
+        clearance=0.3mm
+         li:ps_poly {
+          -0.7mm  
+          74.80314961mil  
+          0.7mm  
+          74.80314961mil  
+          0.7mm  
+          -2.0mm  
+          -0.7mm  
+          -2.0mm  
+         }
+       }
+     }
+   }
+
+   ha:ps_proto_v6.8 {
+     hdia=1.0mm; hplated=1; htop=0; hbottom=0;
+     li:shape {
+
+       ha:ps_shape_v4 {
+        ha:ps_circ { x=0.0; y=0.0; dia=1.6mm;        }
+        ha:combining {        }
+        ha:layer_mask {
+         copper = 1
+         top = 1
+        }
+        clearance=0.0
+       }
+
+       ha:ps_shape_v4 {
+        ha:ps_circ { x=0.0; y=0.0; dia=1.6mm;        }
+        ha:combining {        }
+        ha:layer_mask {
+         bottom = 1
+         copper = 1
+        }
+        clearance=0.0
+       }
+
+       ha:ps_shape_v4 {
+        ha:ps_circ { x=0.0; y=0.0; dia=1.6mm;        }
+        ha:combining {        }
+        ha:layer_mask {
+         copper = 1
+         intern = 1
+        }
+        clearance=0.0
+       }
+
+       ha:ps_shape_v4 {
+        ha:ps_circ { x=0.0; y=0.0; dia=1.7524mm;        }
+        ha:combining { sub=1; auto=1;        }
+        ha:layer_mask {
+         top = 1
+         mask = 1
+        }
+        clearance=0.0
+       }
+
+       ha:ps_shape_v4 {
+        ha:ps_circ { x=0.0; y=0.0; dia=1.7524mm;        }
+        ha:combining { sub=1; auto=1;        }
+        ha:layer_mask {
+         bottom = 1
+         mask = 1
+        }
+        clearance=0.0
+       }
+     }
+   }
+
+   ha:ps_proto_v6.9 {
+     hdia=0.0; hplated=0; htop=0; hbottom=0;
+     li:shape {
+
+       ha:ps_shape_v4 {
+        ha:combining {        }
+        ha:layer_mask {
+         copper = 1
+         top = 1
+        }
+        clearance=24.0mil
+         li:ps_poly {
+          -76.5mil  
+          -20.0mil  
+          76.5mil  
+          -20.0mil  
+          76.5mil  
+          20.0mil  
+          -76.5mil  
+          20.0mil  
+         }
+       }
+
+       ha:ps_shape_v4 {
+        ha:combining { auto=1;        }
+        ha:layer_mask {
+         top = 1
+         paste = 1
+        }
+        clearance=24.0mil
+         li:ps_poly {
+          -74.5mil  
+          -18.0mil  
+          74.5mil  
+          -18.0mil  
+          74.5mil  
+          18.0mil  
+          -74.5mil  
+          18.0mil  
+         }
+       }
+
+       ha:ps_shape_v4 {
+        ha:combining { sub=1; auto=1;        }
+        ha:layer_mask {
+         top = 1
+         mask = 1
+        }
+        clearance=24.0mil
+         li:ps_poly {
+          -78.5mil  
+          -22.0mil  
+          78.5mil  
+          -22.0mil  
+          78.5mil  
+          22.0mil  
+          -78.5mil  
+          22.0mil  
+         }
+       }
+     }
+   }
+
+   ha:ps_proto_v6.10 {
+     hdia=0.3mm; hplated=1; htop=0; hbottom=0;
+     li:shape {
+
+       ha:ps_shape_v4 {
+        ha:ps_circ { x=0.0; y=0.0; dia=0.6mm;        }
+        ha:combining {        }
+        ha:layer_mask {
+         copper = 1
+         top = 1
+        }
+        clearance=0.0
+       }
+
+       ha:ps_shape_v4 {
+        ha:ps_circ { x=0.0; y=0.0; dia=0.6mm;        }
+        ha:combining {        }
+        ha:layer_mask {
+         bottom = 1
+         copper = 1
+        }
+        clearance=0.0
+       }
+
+       ha:ps_shape_v4 {
+        ha:ps_circ { x=0.0; y=0.0; dia=0.6mm;        }
+        ha:combining {        }
+        ha:layer_mask {
+         copper = 1
+         intern = 1
+        }
+        clearance=0.0
+       }
+     }
+   }
+  }
+
+   li:objects {
+   }
+   li:layers {
+
+    ha:top-sig {
+     lid=0
+     group=3
+     ha:combining {     }
+
+      li:objects {
+       ha:line.441828 {
+        x1=4.5mm; y1=3.7mm; x2=4.7mm; y2=3.5mm; thickness=0.15mm; clearance=0.3mm;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.441831 {
+        x1=4.7mm; y1=3.5mm; x2=4.7mm; y2=3.2mm; thickness=0.15mm; clearance=0.3mm;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.441834 {
+        x1=4.7mm; y1=3.2mm; x2=4.88mm; y2=3.02mm; thickness=0.15mm; clearance=0.3mm;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.441837 {
+        x1=4.88mm; y1=3.02mm; x2=5.45mm; y2=3.02mm; thickness=0.15mm; clearance=0.3mm;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.442674 {
+        x1=0.75mm; y1=1.45mm; x2=0.75mm; y2=3.1mm; thickness=0.15mm; clearance=0.3mm;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.442677 {
+        x1=0.75mm; y1=3.1mm; x2=0.85mm; y2=3.2mm; thickness=0.15mm; clearance=0.3mm;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.441822 {
+        x1=3.000001mm; y1=3.7mm; x2=4.5mm; y2=3.7mm; thickness=0.15mm; clearance=0.3mm;
+        ha:flags {
+         clearline=1
+        }
+       }
+      }
+      color = {#8b2323}
+    }
+
+    ha:bottom-sig {
+     lid=1
+     group=8
+     ha:combining {     }
+
+      li:objects {
+      }
+      color = {#3a5fcd}
+    }
+
+    ha:top-gnd {
+     lid=2
+     group=3
+     ha:combining {     }
+
+      li:objects {
+      }
+      color = {#104e8b}
+    }
+
+    ha:bottom-gnd {
+     lid=3
+     group=8
+     ha:combining {     }
+
+      li:objects {
+      }
+      color = {#cd3700}
+    }
+
+    ha:outline {
+     lid=4
+     group=7
+     ha:combining {     }
+
+      li:objects {
+      }
+      color = {#00868b}
+    }
+
+    ha:bottom-silk {
+     lid=5
+     group=10
+     ha:combining { auto=1;     }
+
+      li:objects {
+      }
+      color = {#e3e3e3}
+    }
+
+    ha:top-silk {
+     lid=6
+     group=1
+     ha:combining { auto=1;     }
+
+      li:objects {
+       ha:text.442692 {
+        string=1; x=0.8mm; y=3.35mm; scale=10; fid=0;
+        ha:flags {
+         clearline=1
+        }
+        thickness = 1.0mil
+        rot = 0.000000
+       }
+       ha:text.442695 {
+        string=2; x=2.45mm; y=3.05mm; scale=10; fid=0;
+        ha:flags {
+         clearline=1
+        }
+        thickness = 1.0mil
+        rot = 0.000000
+       }
+       ha:text.442696 {
+        string=3; x=2.95mm; y=3.85mm; scale=10; fid=0;
+        ha:flags {
+         clearline=1
+        }
+        thickness = 1.0mil
+        rot = 0.000000
+       }
+      }
+      color = {#151313}
+    }
+
+    ha:top-paste {
+     lid=7
+     group=0
+     ha:combining { auto=1;     }
+
+      li:objects {
+      }
+      color = {#cd00cd}
+    }
+
+    ha:top-mask {
+     lid=8
+     group=2
+     ha:combining { sub=1; auto=1;     }
+
+      li:objects {
+      }
+      color = {#ff0000}
+    }
+
+    ha:bottom-mask {
+     lid=9
+     group=9
+     ha:combining { sub=1; auto=1;     }
+
+      li:objects {
+      }
+      color = {#ff0000}
+    }
+
+    ha:bottom-paste {
+     lid=10
+     group=11
+     ha:combining { auto=1;     }
+
+      li:objects {
+      }
+      color = {#cd00cd}
+    }
+
+    ha:slot-plated {
+     lid=11
+     group=12
+     ha:combining { auto=1;     }
+
+      li:objects {
+      }
+      color = {#8b7355}
+    }
+
+    ha:slot-unplated {
+     lid=12
+     group=13
+     ha:combining { auto=1;     }
+
+      li:objects {
+      }
+      color = {#00868b}
+    }
+
+    ha:top-assy {
+     lid=13
+     group=14
+     ha:combining {     }
+
+      li:objects {
+      }
+      color = {#444444}
+    }
+
+    ha:bot-assy {
+     lid=14
+     group=15
+     ha:combining {     }
+
+      li:objects {
+      }
+      color = {#444444}
+    }
+
+    ha:fab {
+     lid=15
+     group=16
+     ha:combining { auto=1;     }
+
+      li:objects {
+      }
+      color = {#222222}
+    }
+   }
+ }
+
+
+
+ ha:layer_stack {
+  li:groups {
+   ha:0 {
+    name = top_paste
+    ha:type { top=1; paste=1;    }
+    li:layers { 7;    }
+   }
+   ha:1 {
+    name = top_silk
+    ha:type { silk=1; top=1;    }
+    li:layers { 6;    }
+   }
+   ha:2 {
+    name = top_mask
+    ha:type { top=1; mask=1;    }
+    li:layers { 8;    }
+   }
+   ha:3 {
+    name = top_copper
+    ha:type { copper=1; top=1;    }
+    li:layers { 0; 2;    }
+   }
+   ha:4 {
+    name = grp_4
+    ha:type { substrate=1; intern=1;    }
+    li:layers {    }
+   }
+   ha:5 {
+    name = grp_6
+    ha:type { substrate=1; intern=1;    }
+    li:layers {    }
+   }
+   ha:6 {
+    name = grp_8
+    ha:type { substrate=1; intern=1;    }
+    li:layers {    }
+   }
+   ha:7 {
+    name = global_outline
+    ha:type { boundary=1;    }
+    li:layers { 4;    }
+    purpose = uroute
+   }
+   ha:8 {
+    name = bottom_copper
+    ha:type { bottom=1; copper=1;    }
+    li:layers { 1; 3;    }
+   }
+   ha:9 {
+    name = bottom_mask
+    ha:type { bottom=1; mask=1;    }
+    li:layers { 9;    }
+   }
+   ha:10 {
+    name = bottom_silk
+    ha:type { silk=1; bottom=1;    }
+    li:layers { 5;    }
+   }
+   ha:11 {
+    name = bottom_paste
+    ha:type { bottom=1; paste=1;    }
+    li:layers { 10;    }
+   }
+   ha:12 {
+    name = pmech
+    ha:type { mech=1;    }
+    li:layers { 11;    }
+    purpose = proute
+   }
+   ha:13 {
+    name = umech
+    ha:type { mech=1;    }
+    li:layers { 12;    }
+    purpose = uroute
+   }
+   ha:14 {
+    name = top-assy
+    ha:type { top=1; doc=1;    }
+    li:layers { 13;    }
+    ha:attributes {
+     init-invis=1
+    }
+    purpose = assy
+   }
+   ha:15 {
+    name = bot-assy
+    ha:type { bottom=1; doc=1;    }
+    li:layers { 14;    }
+    ha:attributes {
+     init-invis=1
+    }
+    purpose = assy
+   }
+   ha:16 {
+    name = fab
+    ha:type { top=1; doc=1;    }
+    li:layers { 15;    }
+    ha:attributes {
+     init-invis=1
+    }
+    purpose = fab
+   }
+  }
+ }
+ li:pcb-rnd-conf-v1 {
+  ha:overwrite {
+   ha:design {
+    line_thickness = 150.00 um
+    via_proto = 0
+    text_font_id = 0
+    text_scale = 100
+    text_thickness = 0
+    clearance = 150.00 um
+   }
+   ha:editor {
+    grid_unit = mm
+    rubber_band_keep_midlinedir = false
+    grids_idx = 8
+    grid = 50.00 um
+    line_refraction = 1
+    auto_drc = false
+    buffer_number = 0
+    rubber_band_mode = false
+    ha:view {
+     flip_x = 0
+     flip_y = 0
+    }
+    show_solder_side = 0
+    fullscreen = 0
+    show_drc = true
+   }
+   ha:plugins {
+    ha:show_netnames {
+     enable = true
+    }
+   }
+  }
+ }
+}