Update changelog.md

Author: zer0Kerbal

docs/changelog.md

@@ -21,8 +21,6 @@ CC BY-ND 4.0 by zer0Kerbal -->
 | spacedock  | (https://spacedock.info/mod/2997)                                 |
 | ckan       | AdjustableModPanel                                                |
 
-<<<<<<< Updated upstream
-=======
 ## Version 1.5.99.1-prerelease - `<Thank you Morse>` edition
 
 * Released
@@ -46,7 +44,6 @@ CC BY-ND 4.0 by zer0Kerbal -->
 
 ---
 
->>>>>>> Stashed changes
 ## Version 1.5.99.0-adoption -  `<Peekaboo>` edition
 
 * 12 Mar 2022