diff --git a/Slic3r settings 175/slic3r.ini b/Slic3r settings 175/slic3r.ini
index 4301527..3be605c 100644
--- a/Slic3r settings 175/slic3r.ini	
+++ b/Slic3r settings 175/slic3r.ini	
@@ -1,8 +1,8 @@
 # generated by Slic3r 1.31.1.6-prusa3d-win64 on Thu Oct 27 18:10:59 2016
-autocenter = 1
-background_processing = 
-last_output_path = /Users/josefprusa/i3-antivib
-last_version_check = 1446198512
+autocenter = 0
+background_processing = 0 
+last_output_path = 
+last_version_check = 
 main_frame_maximized = 
 main_frame_pos = 276,200
 main_frame_size = 1562,955
@@ -19,5 +19,5 @@ print = 0.20mm NORMAL.ini
 printer = Prusa i3 1.75.ini
 
 [recent]
-config_directory = /Volumes/Common/Drivers/Prusa3D_1_6_0/MAC
-skein_directory = /Users/josefprusa/Downloads
+config_directory = 
+skein_directory = 
diff --git a/Slic3r settings 3mm/slic3r.ini b/Slic3r settings 3mm/slic3r.ini
index ad1782a..77db865 100644
--- a/Slic3r settings 3mm/slic3r.ini	
+++ b/Slic3r settings 3mm/slic3r.ini	
@@ -1,8 +1,8 @@
 # generated by Slic3r 1.31.1.6-prusa3d-win64 on Thu Oct 27 18:12:06 2016
-autocenter = 1
-background_processing = 1
-last_output_path = /Volumes/NO NAME
-last_version_check = 1443010655
+autocenter = 0
+background_processing = 0
+last_output_path = 
+last_version_check = 
 main_frame_maximized = 
 main_frame_pos = 128,23
 main_frame_size = 1093,667
@@ -18,5 +18,5 @@ print = 0.20mm NORMAL.ini
 printer = Prusa i3.ini
 
 [recent]
-config_directory = /Volumes/Common/Drivers/Prusa3D_1_6_0/MAC
-skein_directory = /Users/josefprusa/Downloads
+config_directory = 
+skein_directory = 
diff --git a/Slic3r settings MK2/slic3r.ini b/Slic3r settings MK2/slic3r.ini
index cc12ddf..f5e5a51 100644
--- a/Slic3r settings MK2/slic3r.ini	
+++ b/Slic3r settings MK2/slic3r.ini	
@@ -1,9 +1,18 @@
+<<<<<<< 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
+main_frame_maximized = 
+main_frame_pos = 26,26
+main_frame_size = 1677,893
+>>>>>>> 07cbe796bd46703f1cb7934ff1af7547ef7f4a75
 mode = expert
 no_controller = 1
 no_defaults = 1