From 4360fa75064471ca406687795bfdec01b493d8b7 Mon Sep 17 00:00:00 2001
From: Robert Muir <rmuir@apache.org>
Date: Fri, 6 Mar 2020 05:52:26 -0500
Subject: [PATCH] add 8.6 section to master branch's MERGE-CONFLICTS.txt for
 consistency

---
 lucene/CHANGES.txt | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 172ef6a1bb8..2a0f19f833b 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -101,6 +101,33 @@ Other
 * LUCENE-8656: Deprecations in FuzzyQuery and get compiler warnings out of 
   queryparser code (Alan Woodward, Erick Erickson)
 
+======================= Lucene 8.6.0 =======================
+
+API Changes
+---------------------
+
+* LUCENE-9265: SimpleFSDirectory is deprecated in favor of NIOFSDirectory. (Yannick Welsch)
+
+New Features
+---------------------
+(No changes)
+
+Improvements
+---------------------
+(No changes)
+
+Optimizations
+---------------------
+(No changes)
+
+Bug Fixes
+---------------------
+(No changes)
+
+Other
+---------------------
+(No changes)
+
 ======================= Lucene 8.5.0 =======================
 
 API Changes