diff --git a/Slic3r settings MK2/print/0.20mm NORMAL.ini b/Slic3r settings MK2/print/0.20mm NORMAL.ini
index 45ae117..e64d9ee 100644
--- a/Slic3r settings MK2/print/0.20mm NORMAL.ini	
+++ b/Slic3r settings MK2/print/0.20mm NORMAL.ini	
@@ -1,4 +1,4 @@
-# generated by Slic3r 1.33.2.27-prusa3d-win64 on Tue Jan 31 17:29:37 2017
+# generated by Slic3r 1.33.2.27-prusa3d-win64 on Wed Feb  1 12:38:57 2017
 avoid_crossing_perimeters = 0
 bottom_solid_layers = 5
 bridge_acceleration = 1000
@@ -89,7 +89,7 @@ support_material_xy_spacing = 60%
 thin_walls = 0
 threads = 4
 top_infill_extrusion_width = 0.4
-top_solid_infill_speed = 20
+top_solid_infill_speed = 30
 top_solid_layers = 6
 travel_speed = 120
 xy_size_compensation = 0
diff --git a/Slic3r settings MK2/slic3r.ini b/Slic3r settings MK2/slic3r.ini
index f5e5a51..0faf174 100644
--- a/Slic3r settings MK2/slic3r.ini	
+++ b/Slic3r settings MK2/slic3r.ini	
@@ -1,18 +1,9 @@
-<<<<<<< HEAD
-# generated by Slic3r 1.33.2.27-prusa3d-win64 on Tue Jan 31 17:29:58 2017
-autocenter = 1
-background_processing = 1
-main_frame_maximized = 1
-main_frame_pos = -8,-8
-main_frame_size = 1936,1066
-=======
-# generated by Slic3r 1.31.5-prusa3d-win64 on Tue Nov 15 20:13:09 2016
-autocenter = 0
-background_processing = 0
+# generated by Slic3r 1.33.2.27-prusa3d-win64 on Thu Feb  2 09:02:28 2017
+autocenter = 
+background_processing = 
 main_frame_maximized = 
 main_frame_pos = 26,26
-main_frame_size = 1677,893
->>>>>>> 07cbe796bd46703f1cb7934ff1af7547ef7f4a75
+main_frame_size = 910,666
 mode = expert
 no_controller = 1
 no_defaults = 1
@@ -21,5 +12,5 @@ version_check = 1
 
 [presets]
 filament = Prusa PLA 1.75mm.ini
-print = 0.15mm OPTIMAL.ini
+print = 0.05mm DETAIL.ini
 printer = Original Prusa i3 MK2 with ZHop.ini