diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0699684..c146e53 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,4 @@
-<<<<<<< HEAD
-## 2.17.4 - 2022-06-20
+## 2.17.5 - 2022-06-22
 
 This is a patch release that fixes:
 
diff --git a/tools/VERSION b/tools/VERSION
index f9aa7cc..7e91410 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -26,6 +26,6 @@
 CHANNEL stable
 MAJOR 2
 MINOR 17
-PATCH 4
+PATCH 5
 PRERELEASE 0
 PRERELEASE_PATCH 0
\ No newline at end of file