diff --git a/HISTORY.md b/HISTORY.md
index b2cbfed9..2a04df3e 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,3 +1,17 @@
+# 6.0 / 2023-08-01
+
+* Default to local PlantUML server for security. #412. (@manofstick)
+* Allow use of default branch name `main` or `master. Resolves https://github.com/gollum/gollum/issues/1813. (@dometto)
+* Feature: [support for custom rendering of languages in codeblocks](https://github.com/gollum/gollum/wiki/Custom-language-handlers). #433. (@dometto)
+* Support use of commit notes in Gollum::Committer. #435. (@dometto, @bartkamphorst)
+* Remove octicons from gollum-lib. Icon macros must now be styled independently. #441. (@bartkamphorst)
+* Huge performance increase for large wikis! :rocket: #437. (@dometto)
+
+### Bugfixes
+
+* Fix the use of boolean arguments in Macros. #441. (@dometto)
+* Fix broken relative links: these were previously not rendered as relative. #443. (@dometto)
+
 # 5.2.4 / 2023-03-22
 
 * Bugfix release: address XSS vulnerability ( @6661620a, @dometto)
diff --git a/LATEST_CHANGES.md b/LATEST_CHANGES.md
index 230f14b0..f2766a82 100644
--- a/LATEST_CHANGES.md
+++ b/LATEST_CHANGES.md
@@ -1,21 +1,13 @@
-<<<<<<< HEAD
-# 5.2.4 / 2023-03-22
-
-* Bugfix release: address XSS vulnerability ( @6661620a, @dometto)
-=======
 # 6.0
 
 * Default to local PlantUML server for security. #412. (@manofstick)
 * Allow use of default branch name `main` or `master. Resolves https://github.com/gollum/gollum/issues/1813. (@dometto)
-<<<<<<< HEAD
->>>>>>> 462ce53 (Implement default branch detection, move away from master as default. (#424))
-=======
-* Support use of commit notes in Gollum::Committer. (@dometto, @bartkamphorst)
-<<<<<<< HEAD
->>>>>>> 8384b51 (Support for git notes (#435))
-=======
+* Feature: [support for custom rendering of languages in codeblocks](https://github.com/gollum/gollum/wiki/Custom-language-handlers). #433. (@dometto)
+* Support use of commit notes in Gollum::Committer. #435. (@dometto, @bartkamphorst)
+* Remove octicons from gollum-lib. Icon macros must now be styled independently. #441. (@bartkamphorst)
+* Huge performance increase for large wikis! :rocket: #437. (@dometto)
 
 ### Bugfixes
 
 * Fix the use of boolean arguments in Macros. #441. (@dometto)
->>>>>>> 0db2ff5 (Ensure boolean Macro arguments are parsed as boolean. Resolves #441 (#447))
+* Fix broken relative links: these were previously not rendered as relative. #443. (@dometto)
\ No newline at end of file
diff --git a/gemspec.rb b/gemspec.rb
index ebe3f378..6329eb37 100644
--- a/gemspec.rb
+++ b/gemspec.rb
@@ -89,10 +89,11 @@ def specification(version, default_adapter, platform = nil)
     lib/gollum-lib/macro.rb
     lib/gollum-lib/macro/all_pages.rb
     lib/gollum-lib/macro/audio.rb
+    lib/gollum-lib/macro/flash.rb
     lib/gollum-lib/macro/global_toc.rb
+    lib/gollum-lib/macro/icon.rb
     lib/gollum-lib/macro/navigation.rb
     lib/gollum-lib/macro/note.rb
-    lib/gollum-lib/macro/icon.rb
     lib/gollum-lib/macro/series.rb
     lib/gollum-lib/macro/video.rb
     lib/gollum-lib/macro/warn.rb
diff --git a/lib/gollum-lib/version.rb b/lib/gollum-lib/version.rb
index c515be2d..a33f9d09 100644
--- a/lib/gollum-lib/version.rb
+++ b/lib/gollum-lib/version.rb
@@ -1,5 +1,5 @@
 module Gollum
   module Lib
-    VERSION = '5.2.4'
+    VERSION = '6.0'
   end
 end