diff a/PrintLibrary/ExportLibraryItemWindow.cs b/PrintLibrary/ExportLibraryItemWindow.cs	(rejected hunks)
@@ -9,7 +9,11 @@
 using MatterHackers.MatterControl.DataStorage;
 using MatterHackers.MatterControl.PrintQueue;
 using MatterHackers.GCodeVisualizer;
+<<<<<<< HEAD
 using MatterHackers.Localizations;
+=======
+using MatterHackers.MatterControl.SlicerConfiguration;
+>>>>>>> upstream/development
 
 namespace MatterHackers.MatterControl.PrintLibrary
 {