diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 223a08e05..8dda32941 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -35,6 +35,7 @@ Fixed
 - Adjust error message to point out QtWebEngine is unsupported with the OS
   X .app currently.
 - Hide Harfbuzz warning with the OS X .app
+>>>>>>> 95d1721... Release v0.8.1
 
 v0.8.0
 ------