diff --git a/CHANGELOG.md b/CHANGELOG.md
index 559e1fe06..3da283aa4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,15 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](https://semver.org/).
 We are following the [Keep a Changelog](https://keepachangelog.com/) format.
 
-## [Unreleased](https://github.com/FredrikNoren/ungit/compare/v1.5.17...master)
+## [Unreleased](https://github.com/FredrikNoren/ungit/compare/v1.5.18...master)
+
+## [1.5.18](https://github.com/FredrikNoren/ungit/compare/v1.5.17...v1.5.18)
+
+### Fixes
+- simple git flow breaks ungit [#1460](https://github.com/FredrikNoren/ungit/issues/1460)
+
+### Changed
+- Bump Dependencies [#1479](https://github.com/FredrikNoren/ungit/pull/1479)
 
 ## [1.5.17](https://github.com/FredrikNoren/ungit/compare/v1.5.16...v1.5.17)
 
diff --git a/package-lock.json b/package-lock.json
index d741aaf7a..c4f4914e4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,11 +1,11 @@
 {
   "name": "ungit",
-  "version": "1.5.17",
+  "version": "1.5.18",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
-      "version": "1.5.17",
+      "version": "1.5.18",
       "license": "MIT",
       "dependencies": {
         "@primer/octicons": "~14.1.0",
diff --git a/package.json b/package.json
index 641e22406..56ca47915 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "ungit",
   "author": "Fredrik Norén <fredrik.jw.noren@gmail.com>",
   "description": "Git made easy",
-  "version": "1.5.17",
+  "version": "1.5.18",
   "ungitPluginApiVersion": "0.2.0",
   "scripts": {
     "start": "node ./bin/ungit",