diff --git a/HISTORY.md b/HISTORY.md
index 0583eec9ac..7943e77272 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -137,7 +137,6 @@
   * The DecisionStump class has been marked deprecated; use the `DecisionTree`
     class with `NoRecursion=true` or use `ID3DecisionStump` instead (#2099).
 
->>>>>>> origin/master
   * Added `probabilities_file` parameter to get the probabilities matrix of
     AdaBoost classifier (#2050).