Fix changelog after merge

CHANGES.md

@@ -4,19 +4,15 @@
 
 - [pull #559] Allow cuddled tables (#557)
 - [pull #560] Fix `markdown-in-html` not always splitting HTML tags into separate lines (#558)
-
+- [pull #519] Add support for custom extras
+- [pull #519] Drop Python 3.5 support
 
 ## python-markdown2 2.4.12
 
 - [pull #547] Update `markdown-in-html` extra to handle markdown on same line as HTML (#546)
 - [pull #550] Fix tables with trailing whitespace not being recognized (#549)
 - [pull #545] Fix multiple instances of strong emphasis (`**`) in one line (#541)
-<<<<<<< HEAD
-- [pull #519] Add support for custom extras
-- [pull #519] Drop Python 3.5 support
-=======
 - [pull #556] Fix incorrect parsing of links after square brackets (#552)
->>>>>>> master
 
 ## python-markdown2 2.4.11