diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE
index 59df2556..e69de29b 100644
--- a/CHANGES_NEXT_RELEASE
+++ b/CHANGES_NEXT_RELEASE
@@ -1,19 +0,0 @@
-<<<<<<< HEAD
-
-=======
-- Add: new approach to handle trust auth (urbo-deployer#868)
-- Remove: field "authentication" support in update action
-- Remove: config.authentication (along with related env vars PERSEO_AUTHENTICATION_*)
-- Add: allow use expandVar with JSON objects (#703)
-- Add: apply expandVar with JSON.parse to all fields of all actions (sms, smpp, email, post, update) (#746)
-- Fix: check domain before access domain
-- Fix: expandVar return a 'null' instead of null (#746)
-- Fix: expandVar for single string values with null, boolean, number (#746)
-- Fix: smtp and smpp logs (#738)
-- Add: allow access entities using NGSIv2 API for non_signal rules (new setting nonSignalByAPI / PERSEO_CHECK_NON_SIGNAL_BY_API) (#549)
-- Remove support for ngsv1 notifications (#714)
-- Remove ngsiv1 support for updateAction (#714)
-- Fix: check timer string in lower case in TimedRule checker
-- Fix: dep of chai get-func-name to 2.0.0 to avoid installation errors
-- Remove: RPM stuff
->>>>>>> master