diff --git a/NEWS.md b/NEWS.md
index 8401d34223..57b7ee3ed0 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # 4.10.0.9000
 
 ## Changes to plotly.js