diff --git a/CHANGELOG.md b/CHANGELOG.md
index cc58770d..72740876 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## [1.36] - 2020-01-28
+* Automatically resolve merge conflicts
+* New combined editor / viewer
+* Allow Notes to moved to another Folder
+
 ## [1.35] - 2020-01-27
 * Allow notes to be renamed
 * Dark Theme improvements
diff --git a/pubspec.yaml b/pubspec.yaml
index 0d527312..85669281 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: gitjournal
 description: A Note Taking App Built on top of Git
-version: 1.35.0+10
+version: 1.36.0+10
 
 dependencies:
   flutter: