diff --git a/Connector.SchLib.BASE.SchLib b/Connector.SchLib.BASE.SchLib
deleted file mode 100644
index e69de29..0000000
diff --git a/Connector.SchLib.LOCAL.SchLib b/Connector.SchLib.LOCAL.SchLib
deleted file mode 100644
index 29fae8f..0000000
Binary files a/Connector.SchLib.LOCAL.SchLib and /dev/null differ
diff --git a/Connector.SchLib.REMOTE.SchLib b/Connector.SchLib.REMOTE.SchLib
deleted file mode 100644
index 064feb5..0000000
Binary files a/Connector.SchLib.REMOTE.SchLib and /dev/null differ
diff --git a/MEANWELL.jpg b/MEANWELL.jpg
new file mode 100644
index 0000000..8e001f8
Binary files /dev/null and b/MEANWELL.jpg differ
diff --git a/MEANWELL2.jpg b/MEANWELL2.jpg
new file mode 100644
index 0000000..87265a7
Binary files /dev/null and b/MEANWELL2.jpg differ
diff --git a/MEANWELL3.jpg b/MEANWELL3.jpg
new file mode 100644
index 0000000..c87874b
Binary files /dev/null and b/MEANWELL3.jpg differ
diff --git a/MEANWELL4.jpg b/MEANWELL4.jpg
new file mode 100644
index 0000000..085dc38
Binary files /dev/null and b/MEANWELL4.jpg differ
diff --git a/Project Outputs for dk/dk.IntLib b/Project Outputs for dk/dk.IntLib
new file mode 100644
index 0000000..b5e7488
Binary files /dev/null and b/Project Outputs for dk/dk.IntLib differ
diff --git a/cleardir.bat b/cleardir.bat
index 7ac862d..e2f8230 100644
--- a/cleardir.bat
+++ b/cleardir.bat
@@ -1 +1,5 @@
+<<<<<<< HEAD
 c:\work\utils\cleardir.exe
+=======
+d:\work\utils\cleardir.exe
+>>>>>>> 4d616cbad7f48a6a18a7580d5ff57f76a451415c
diff --git a/dk.LibPkg b/dk.LibPkg
index 05c71d0..2ee335d 100644
--- a/dk.LibPkg
+++ b/dk.LibPkg
@@ -362,6 +362,7 @@ DItemRevisionGUID=
 GenerateClassCluster=0
 DocumentUniqueId=ACMAPUKJ
 
+<<<<<<< HEAD
 [Document20]
 DocumentPath=Conn2.SchLib
 AnnotationEnabled=1
@@ -447,6 +448,8 @@ DItemRevisionGUID=
 GenerateClassCluster=0
 DocumentUniqueId=
 
+=======
+>>>>>>> 4d616cbad7f48a6a18a7580d5ff57f76a451415c
 [SearchPath1]
 Path=D:\DK\Work\AD\Library\Project Outputs for dk\dk\*.*
 IncludeSubFolders=1
@@ -454,7 +457,11 @@ IncludeSubFolders=1
 [OutputGroup1]
 Name=Netlist Outputs
 Description=
+<<<<<<< HEAD
 TargetPrinter=RICOH M C2000 (a27792)
+=======
+TargetPrinter=KONICA MINOLTA C360iSeriesPCL
+>>>>>>> 4d616cbad7f48a6a18a7580d5ff57f76a451415c
 PrinterOptions=Record=PrinterOptions|Copies=1|Duplex=1|TrueTypeOptions=3|Collate=1|PrintJobKind=1|PrintWhat=1
 OutputType1=PADSNetlist
 OutputName1=PADS ASCII Netlist
@@ -560,7 +567,11 @@ OutputDefault20=0
 [OutputGroup2]
 Name=Simulator Outputs
 Description=
+<<<<<<< HEAD
 TargetPrinter=pdfFactory Pro (7.x)
+=======
+TargetPrinter=KONICA MINOLTA C360iSeriesPCL
+>>>>>>> 4d616cbad7f48a6a18a7580d5ff57f76a451415c
 PrinterOptions=Record=PrinterOptions|Copies=1|Duplex=1|TrueTypeOptions=3|Collate=1|PrintJobKind=1|PrintWhat=1
 
 [OutputGroup3]
@@ -656,7 +667,11 @@ PageOptions11=Record=PageOptions|CenterHorizontal=True|CenterVertical=True|Print
 [OutputGroup4]
 Name=Assembly Outputs
 Description=
+<<<<<<< HEAD
 TargetPrinter=RICOH M C2000 (a27792)
+=======
+TargetPrinter=KONICA MINOLTA C360iSeriesPCL
+>>>>>>> 4d616cbad7f48a6a18a7580d5ff57f76a451415c
 PrinterOptions=Record=PrinterOptions|Copies=1|Duplex=1|TrueTypeOptions=3|Collate=1|PrintJobKind=1|PrintWhat=1
 OutputType1=Assembly
 OutputName1=Assembly Drawings
@@ -678,7 +693,11 @@ OutputDefault3=0
 [OutputGroup5]
 Name=Fabrication Outputs
 Description=
+<<<<<<< HEAD
 TargetPrinter=RICOH M C2000 (a27792)
+=======
+TargetPrinter=KONICA MINOLTA C360iSeriesPCL
+>>>>>>> 4d616cbad7f48a6a18a7580d5ff57f76a451415c
 PrinterOptions=Record=PrinterOptions|Copies=1|Duplex=1|TrueTypeOptions=3|Collate=1|PrintJobKind=1|PrintWhat=1
 OutputType1=Board Stack Report
 OutputName1=Report Board Stack
@@ -750,7 +769,11 @@ OutputDefault12=0
 [OutputGroup6]
 Name=Report Outputs
 Description=
+<<<<<<< HEAD
 TargetPrinter=RICOH M C2000 (a27792)
+=======
+TargetPrinter=KONICA MINOLTA C360iSeriesPCL
+>>>>>>> 4d616cbad7f48a6a18a7580d5ff57f76a451415c
 PrinterOptions=Record=PrinterOptions|Copies=1|Duplex=1|TrueTypeOptions=3|Collate=1|PrintJobKind=1|PrintWhat=1
 OutputType1=BOM_PartType
 OutputName1=Bill of Materials
@@ -792,7 +815,11 @@ OutputDefault7=0
 [OutputGroup7]
 Name=Other Outputs
 Description=
+<<<<<<< HEAD
 TargetPrinter=RICOH M C2000 (a27792)
+=======
+TargetPrinter=KONICA MINOLTA C360iSeriesPCL
+>>>>>>> 4d616cbad7f48a6a18a7580d5ff57f76a451415c
 PrinterOptions=Record=PrinterOptions|Copies=1|Duplex=1|TrueTypeOptions=3|Collate=1|PrintJobKind=1|PrintWhat=1
 OutputType1=Text Print
 OutputName1=Text Print
@@ -900,7 +927,11 @@ PageOptions17=Record=PageOptions|CenterHorizontal=True|CenterVertical=True|Print
 [OutputGroup8]
 Name=Validation Outputs
 Description=
+<<<<<<< HEAD
 TargetPrinter=RICOH M C2000 (a27792)
+=======
+TargetPrinter=KONICA MINOLTA C360iSeriesPCL
+>>>>>>> 4d616cbad7f48a6a18a7580d5ff57f76a451415c
 PrinterOptions=Record=PrinterOptions|Copies=1|Duplex=1|TrueTypeOptions=3|Collate=1|PrintJobKind=1|PrintWhat=1
 OutputType1=BOM_Violations
 OutputName1=BOM Checks Report
@@ -944,7 +975,11 @@ OutputDefault7=0
 [OutputGroup9]
 Name=Export Outputs
 Description=
+<<<<<<< HEAD
 TargetPrinter=RICOH M C2000 (a27792)
+=======
+TargetPrinter=KONICA MINOLTA C360iSeriesPCL
+>>>>>>> 4d616cbad7f48a6a18a7580d5ff57f76a451415c
 PrinterOptions=Record=PrinterOptions|Copies=1|Duplex=1|TrueTypeOptions=3|Collate=1|PrintJobKind=1|PrintWhat=1
 OutputType1=AutoCAD dwg/dxf PCB
 OutputName1=AutoCAD dwg/dxf File PCB
@@ -1005,7 +1040,11 @@ OutputDefault11=0
 [OutputGroup10]
 Name=PostProcess Outputs
 Description=
+<<<<<<< HEAD
 TargetPrinter=RICOH M C2000 (a27792)
+=======
+TargetPrinter=KONICA MINOLTA C360iSeriesPCL
+>>>>>>> 4d616cbad7f48a6a18a7580d5ff57f76a451415c
 PrinterOptions=Record=PrinterOptions|Copies=1|Duplex=1|TrueTypeOptions=3|Collate=1|PrintJobKind=1|PrintWhat=1
 OutputType1=Copy Files
 OutputName1=Copy Files