diff --git a/UPGRADE-3.0.md b/UPGRADE-3.0.md
index 96778e36ee..8925b91189 100644
--- a/UPGRADE-3.0.md
+++ b/UPGRADE-3.0.md
@@ -403,7 +403,6 @@ UPGRADE FROM 2.x to 3.0
 
  * The `choice_list` option of `ChoiceType` was removed.
 
->>>>>>> 2.8
  * The option "precision" was renamed to "scale".
 
    Before: