diff --git a/all/dotSCAD.scad b/all/dotSCAD.scad
deleted file mode 100644
index 939a7d0d..00000000
--- a/all/dotSCAD.scad
+++ /dev/null
@@ -1,114 +0,0 @@
-include <along_with.scad>;
-include <arc.scad>;
-include <arc_path.scad>;
-include <archimedean_spiral.scad>;
-include <archimedean_spiral_extrude.scad>;
-include <bend.scad>;
-include <bend_extrude.scad>;
-include <bezier_curve.scad>;
-include <bezier_smooth.scad>;
-include <bezier_surface.scad>;
-include <bijection_offset.scad>;
-include <box_extrude.scad>;
-include <circle_path.scad>;
-include <cross_sections.scad>;
-include <crystal_ball.scad>;
-include <ellipse_extrude.scad>;
-include <function_grapher.scad>;
-include <golden_spiral.scad>;
-include <golden_spiral_extrude.scad>;
-include <helix.scad>;
-include <helix_extrude.scad>;
-include <hexagons.scad>;
-include <hollow_out.scad>;
-include <hull_polyline2d.scad>;
-include <hull_polyline3d.scad>;
-include <in_polyline.scad>;
-include <in_shape.scad>;
-include <line2d.scad>;
-include <line3d.scad>;
-<<<<<<< HEAD
-include <log.scad>;
-include <m_cumulate.scad>;
-include <m_mirror.scad>;
-include <m_rotation.scad>;
-include <m_scaling.scad>;
-include <m_shearing.scad>;
-include <m_translation.scad>;
-include <midpt_smooth.scad>;
-include <multi_line_text.scad>;
-include <parse_number.scad>;
-=======
-include <midpt_smooth.scad>;
-include <multi_line_text.scad>;
->>>>>>> v2
-include <path_extrude.scad>;
-include <path_scaling_sections.scad>;
-include <paths2sections.scad>;
-include <pie.scad>;
-include <polyline2d.scad>;
-include <polyline3d.scad>;
-include <polysections.scad>;
-include <polytransversals.scad>;
-include <ring_extrude.scad>;
-include <rotate_p.scad>;
-include <rounded_cube.scad>;
-include <rounded_cylinder.scad>;
-include <rounded_extrude.scad>;
-include <rounded_square.scad>;
-include <shape_arc.scad>;
-include <shape_cyclicpolygon.scad>;
-include <shape_ellipse.scad>;
-include <shape_glued2circles.scad>;
-include <shape_path_extend.scad>;
-include <shape_pentagram.scad>;
-include <shape_pie.scad>;
-include <shape_square.scad>;
-include <shape_starburst.scad>;
-include <shape_superformula.scad>;
-include <shape_taiwan.scad>;
-include <shape_trapezium.scad>;
-include <shear.scad>;
-include <sphere_spiral.scad>;
-include <sphere_spiral_extrude.scad>;
-<<<<<<< HEAD
-include <split_str.scad>;
-include <starburst.scad>;
-include <stereographic_extrude.scad>;
-include <sub_str.scad>;
-include <torus_knot.scad>;
-include <triangulate.scad>;
-include <trim_shape.scad>;
-include <turtle2d.scad>;
-include <turtle3d.scad>;
-include <voronoi2d.scad>;
-include <voronoi3d.scad>;
-=======
-include <starburst.scad>;
-include <stereographic_extrude.scad>;
-include <torus_knot.scad>;
-include <triangulate.scad>;
-include <trim_shape.scad>;
-include <voronoi2d.scad>;
-include <voronoi3d.scad>;
-include <util/parse_number.scad>;
-include <util/split_str.scad>;
-include <util/sub_str.scad>;
-include <util/reverse.scad>;
-include <util/slice.scad>;
-include <util/sort.scad>;
-include <matrix/m_cumulate.scad>;
-include <matrix/m_mirror.scad>;
-include <matrix/m_rotation.scad>;
-include <matrix/m_scaling.scad>;
-include <matrix/m_shearing.scad>;
-include <matrix/m_translation.scad>;
-include <turtle/turtle2d.scad>;
-include <turtle/turtle3d.scad>;
-include <pixel/px_line.scad>;
-include <pixel/px_polyline.scad>;
-include <pixel/px_circle.scad>;
-include <pixel/px_cylinder.scad>;
-include <pixel/px_sphere.scad>;
-include <pixel/px_polygon.scad>;
->>>>>>> v2