diff --git a/src/slic3r/GUI/PresetComboBoxes.cpp b/src/slic3r/GUI/PresetComboBoxes.cpp
index be34f6c5d..b76e903cd 100644
--- a/src/slic3r/GUI/PresetComboBoxes.cpp
+++ b/src/slic3r/GUI/PresetComboBoxes.cpp
@@ -912,7 +912,7 @@ void PlaterPresetComboBox::update()
     const AppConfig* app_config = wxGetApp().app_config;
     if (!template_presets.empty() && app_config->get("no_templates") == "0") {
         set_label_marker(Append(separator(L("Template presets")), wxNullBitmap));
-        for (std::map<wxString, wxBitmap*>::iterator it = template_presets.begin(); it != template_presets.end(); ++it) {
+        for (std::map<wxString, wxBitmapBundle*>::iterator it = template_presets.begin(); it != template_presets.end(); ++it) {
             Append(it->first, *it->second);
             validate_selection(it->first == selected_user_preset);
         }
@@ -1100,7 +1100,7 @@ void TabPresetComboBox::update()
 
          if (preset.is_default || preset.is_system) {
             if (preset.vendor && preset.vendor->templates_profile) {
-                template_presets.emplace(get_preset_name(preset), std::pair<wxBitmap*, bool>(bmp, is_enabled));
+                template_presets.emplace(get_preset_name(preset), std::pair<wxBitmapBundle*, bool>(bmp, is_enabled));
                 if (i == idx_selected)
                     selected = get_preset_name(preset);
             } else {
@@ -1125,7 +1125,7 @@ void TabPresetComboBox::update()
     const AppConfig* app_config = wxGetApp().app_config;
     if (!template_presets.empty() && app_config->get("no_templates") == "0") {
         set_label_marker(Append(separator(L("Template presets")), wxNullBitmap));
-        for (std::map<wxString, std::pair<wxBitmap*, bool>>::iterator it = template_presets.begin(); it != template_presets.end(); ++it) {
+        for (std::map<wxString, std::pair<wxBitmapBundle*, bool>>::iterator it = template_presets.begin(); it != template_presets.end(); ++it) {
             int item_id = Append(it->first, *it->second.first);
             bool is_enabled = it->second.second;
             if (!is_enabled)
diff --git a/src/slic3r/GUI/SavePresetDialog.hpp b/src/slic3r/GUI/SavePresetDialog.hpp
index 0199e27de..3088d457f 100644
--- a/src/slic3r/GUI/SavePresetDialog.hpp
+++ b/src/slic3r/GUI/SavePresetDialog.hpp
@@ -87,7 +87,6 @@ private:
 
 public:
 
-<<<<<<< master
     const wxString& get_info_line_extention() { return m_info_line_extention; }
 
     SavePresetDialog(wxWindow* parent, Preset::Type type, std::string suffix = "", bool template_filament = false);