diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 519cdfa9819..52112cd889b 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -173,7 +173,6 @@ New Features
 * SOLR-9844: FieldCache information fetched via the mbeans handler or seen via the UI now displays the total size used.
   The individual cache entries in the response are now formatted better as well. (Varun Thacker)
 
-<<<<<<< HEAD
 * SOLR-9513: Generic authentication plugins (GenericHadoopAuthPlugin and ConfigurableInternodeAuthHadoopPlugin) that delegate
   all functionality to Hadoop authentication framework. (Hrishikesh Gadre via Ishan Chattopadhyaya)