diff --git a/src/libslic3r/Preset.cpp b/src/libslic3r/Preset.cpp
index 1d2b501d7..9ba39e29b 100644
--- a/src/libslic3r/Preset.cpp
+++ b/src/libslic3r/Preset.cpp
@@ -661,8 +661,6 @@ std::string Preset::get_printer_type(PresetBundle *preset_bundle)
     return "";
 }
 
-<<<<<<< HEAD   (8eb681 FIX: fix use ams always checked)
-=======
 std::string Preset::get_current_printer_type(PresetBundle *preset_bundle)
 {
     if (preset_bundle) {
@@ -685,7 +683,6 @@ bool Preset::is_custom_defined()
         return true;
     return false;
 }
->>>>>>> CHANGE (84edf0 FIX: the P1P printer is not support smooth timelapse)
 
 bool Preset::is_bbl_vendor_preset(PresetBundle *preset_bundle)
 {
@@ -707,13 +704,6 @@ bool Preset::is_bbl_vendor_preset(PresetBundle *preset_bundle)
     return is_bbl_vendor_preset;
 }
 
-bool Preset::is_custom_defined()
-{
-    if (custom_defined == "1")
-        return true;
-    return false;
-}
-
 static std::vector<std::string> s_Preset_print_options {
     "layer_height", "initial_layer_print_height", "wall_loops", "slice_closing_radius", "spiral_mode", "slicing_mode",
     "top_shell_layers", "top_shell_thickness", "bottom_shell_layers", "bottom_shell_thickness",