diff --git a/CHANGELOG.md b/CHANGELOG.md
index 10eca711..818dbdbb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines.
 
+## [7.0.5](https://github.com/obsidianMkdocs/obsidian-github-publisher/compare/7.0.4...7.0.5) (2024-04-01)
+
+
+### Bug Fixes
+
+* error when merge conflic ([c78c0fe](https://github.com/obsidianMkdocs/obsidian-github-publisher/commit/c78c0fe90fbc710dbc89a5495a5d40503b81d79c))
+
 ## [7.0.4](https://github.com/obsidianMkdocs/obsidian-github-publisher/compare/7.0.3...7.0.4) (2024-03-31)
 
 
diff --git a/manifest-beta.json b/manifest-beta.json
index 34db68a6..b1397c1f 100644
--- a/manifest-beta.json
+++ b/manifest-beta.json
@@ -1,7 +1,7 @@
 {
 	"id": "obsidian-mkdocs-publisher",
 	"name": "Github Publisher",
-	"version": "7.0.4",
+	"version": "7.0.5",
 	"minAppVersion": "0.15.4",
 	"description": "Github Publisher helps you to publish your notes on a preconfigured GitHub repository, for free, and more!",
 	"author": "Mara-Li",
diff --git a/manifest.json b/manifest.json
index 22f7b7de..b32117a8 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "obsidian-mkdocs-publisher",
 	"name": "Github Publisher",
-	"version": "7.0.4",
+	"version": "7.0.5",
 	"minAppVersion": "0.15.4",
 	"description": "Github Publisher helps you to publish your notes on a preconfigured GitHub repository, for free, and more!",
 	"author": "Mara-Li",
diff --git a/package-lock.json b/package-lock.json
index d5e850b0..538d2b65 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "obsidian-github-publisher",
-	"version": "7.0.4",
+	"version": "7.0.5",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "obsidian-github-publisher",
-			"version": "7.0.4",
+			"version": "7.0.5",
 			"license": "AGPL-3.0",
 			"dependencies": {
 				"@excalidraw/utils": "^0.1.2",
diff --git a/package.json b/package.json
index cbe868d8..597b7d91 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "obsidian-github-publisher",
-	"version": "7.0.4",
+	"version": "7.0.5",
 	"description": "Github Publisher is a plugin that help you to send file in a configured Github Repository, based on a frontmatter entry state.",
 	"main": "main.js",
 	"scripts": {