(DOCSP-34941) release notes for ver 2.14.12

Author: carriecwk

source/release-notes.txt

@@ -20,7 +20,6 @@ Release Notes for |bi|
 .. expect and we don't break the links on the downloads page.
 .. (DOCS-9670 for context)
 
-<<<<<<< HEAD
 .. _bi-2-14-12:
 
 |bi| 2.14.12
@@ -101,8 +100,6 @@ Bug Fixes
 - Adds MacOS 13.0 ARM support.
 - Adds Debian 12 support. 
 
-=======
->>>>>>> bfb4e7c ((DOCSP-34941) troubleshooting)
 .. _bi-2-14-8:
 
 |bi| 2.14.8