diff --git a/src/app/valentina/dialogs/dialogpatternproperties.cpp b/src/app/valentina/dialogs/dialogpatternproperties.cpp
index 7e4020484..b4c0c7d3e 100644
--- a/src/app/valentina/dialogs/dialogpatternproperties.cpp
+++ b/src/app/valentina/dialogs/dialogpatternproperties.cpp
@@ -392,7 +392,6 @@ void DialogPatternProperties::DescEdited()
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-<<<<<<< local
 void DialogPatternProperties::ToggleComboBox()
 {
     ui->comboBoxHeight->setEnabled(ui->radioButtonDefFromP->isChecked());
@@ -418,8 +417,6 @@ void DialogPatternProperties::GeneralInfoChanged()
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-=======
->>>>>>> other
 void DialogPatternProperties::SetHeightsChecked(bool enabled)
 {
     ui->checkBoxH92->setChecked(enabled);
diff --git a/src/app/valentina/dialogs/dialogpatternproperties.h b/src/app/valentina/dialogs/dialogpatternproperties.h
index 92b8beb6c..0c26a8661 100644
--- a/src/app/valentina/dialogs/dialogpatternproperties.h
+++ b/src/app/valentina/dialogs/dialogpatternproperties.h
@@ -52,13 +52,10 @@ public:
 signals:
     void UpdateGradation();
 private slots:
-<<<<<<< local
     void ToggleComboBox();
     void DefValueChanged();
     void SecurityValueChanged();
     void GeneralInfoChanged();
-    void DeleteImage();
-=======
     void Apply();
     void Ok();
     void SelectAll(int state);
@@ -66,7 +63,6 @@ private slots:
     void CheckStateSize(int state);
     void DescEdited();
     void ChangeImage();
->>>>>>> other
     void SaveImage();
 private:
     Q_DISABLE_COPY(DialogPatternProperties)