diff --git a/app/client/cypress/support/Pages/GitSync.ts b/app/client/cypress/support/Pages/GitSync.ts
index e509b18c9178..0bf9ffeb4cb7 100644
--- a/app/client/cypress/support/Pages/GitSync.ts
+++ b/app/client/cypress/support/Pages/GitSync.ts
@@ -36,9 +36,9 @@ export class GitSync {
   public _bottomBarMergeButton = ".t--bottom-bar-merge";
   private mergeCTA = "[data-testid=t--git-merge-button]";
   public _mergeBranchDropdownDestination =
-    ".t--merge-branch-dropdown-destination";
+    "[data-testid=t--merge-branch-dropdown-destination]";
   public _mergeBranchDropdownmenu =
-    ".t--merge-branch-dropdown-destination .rc-select-selection-search-input";
+    "[data-testid=t--merge-branch-dropdown-destination] .rc-select-selection-search-input";
   public _dropdownmenu = ".rc-select-item-option-content";
   private _openRepoButton = "[data-testid=t--git-repo-button]";
   public _commitButton = ".t--commit-button";
@@ -371,8 +371,9 @@ export class GitSync {
     this.agHelper.WaitUntilEleAppear(this._mergeBranchDropdownmenu);
     this.agHelper.WaitUntilEleDisappear(this._mergeLoader);
     this.assertHelper.AssertNetworkStatus("@getBranch", 200);
+    this.agHelper.WaitUntilEleAppear(this._mergeBranchDropdownmenu);
     this.agHelper.GetNClick(this._mergeBranchDropdownmenu, 0, true);
-    this.agHelper.WaitUntilEleAppear(this._dropdownmenu);
+    this.agHelper.AssertContains(destinationBranch);
     this.agHelper.GetNClickByContains(this._dropdownmenu, destinationBranch);
     this.agHelper.AssertElementAbsence(this._checkMergeability, 35000);
   }
diff --git a/app/client/src/pages/Editor/gitSync/Tabs/Merge.tsx b/app/client/src/pages/Editor/gitSync/Tabs/Merge.tsx
index 27e8c0ebd69e..ad97b469d119 100644
--- a/app/client/src/pages/Editor/gitSync/Tabs/Merge.tsx
+++ b/app/client/src/pages/Editor/gitSync/Tabs/Merge.tsx
@@ -230,7 +230,7 @@ export default function Merge() {
           <Space size={2} />
           <Row style={{ overflow: "unset", paddingBottom: "4px" }}>
             <Select
-              className="t--merge-branch-dropdown-destination"
+              data-testid="t--merge-branch-dropdown-destination"
               dropdownClassName={Classes.MERGE_DROPDOWN}
               dropdownMatchSelectWidth
               getPopupContainer={(triggerNode) => triggerNode.parentNode}