diff --git a/Utils/admin/Update-RscSdkMainBranch.ps1 b/Utils/admin/Update-RscSdkMainBranch.ps1
index a84a0cd1a..a1256ffaa 100644
--- a/Utils/admin/Update-RscSdkMainBranch.ps1
+++ b/Utils/admin/Update-RscSdkMainBranch.ps1
@@ -48,6 +48,10 @@ catch {
     throw "Failed to checkout 'main' branch."
 }
 
+# CHANGELOG.md can be a source of conflict so we check it out manually
+git checkout $sourceBranch -- CHANGELOG.md
+# Same with RubrikSecurityCloud.psd1
+git checkout $sourceBranch -- RubrikSecurityCloud\RubrikSecurityCloud.PowerShell\RubrikSecurityCloud.psd1
 # Merge $sourceBranch into main without commit
 try {
     git merge $sourceBranch --no-commit --no-ff