From 235efa15265d2e07a430fc5989608e73d5290fe4 Mon Sep 17 00:00:00 2001
From: The many faced demon
 <154847721+themanyfaceddemon@users.noreply.github.com>
Date: Thu, 27 Jun 2024 09:43:21 +0300
Subject: [PATCH] Update auto-cl-update-atd.yml

---
 .github/workflows/auto-cl-update-atd.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/auto-cl-update-atd.yml b/.github/workflows/auto-cl-update-atd.yml
index e813c990de7..8d85eb5792b 100644
--- a/.github/workflows/auto-cl-update-atd.yml
+++ b/.github/workflows/auto-cl-update-atd.yml
@@ -48,7 +48,7 @@ jobs:
       run: |
         git fetch origin
         git checkout -B update-changelog origin/update-changelog || git checkout -b update-changelog
-        git merge origin/update-changelog || echo "No changes to merge"
+        git merge -X ours origin/update-changelog || echo "No changes to merge"
 
     - name: Push changes to a new branch
       if: steps.commit-changes.outcome == 'success'