From 2a30fb5af38ae97ce06b54fdd8c17eb22cf660f9 Mon Sep 17 00:00:00 2001
From: Github Actions Bot <>
Date: Wed, 14 Aug 2024 09:58:21 +0000
Subject: [PATCH] docs: Update CHANGELOG.md

---
 CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 593403c6f6c6..36c71673a78b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file.
 
+## [6.1.7] - 2024-08-14
+
+### Bug Fixes
+
+- Messed up on merge-conflicts
+
+
 ## [6.1.6] - 2024-08-14
 
 ### Features