From b16af58aba0701753dd9cb9df41e5147c80970a9 Mon Sep 17 00:00:00 2001
From: Bhumika Saini <sabhumik@amazon.com>
Date: Wed, 4 Oct 2023 23:05:09 +0530
Subject: [PATCH] Resolve CHANGELOG conflict

Signed-off-by: Bhumika Saini <sabhumik@amazon.com>