RCA:
Test was failing because of hard wait
Also the dropdown element which was being clicked was failing
Solution:
Removed hard waits and replaced with intercept
Updated locator and better method to fix tests
EE PR: https://github.com/appsmithorg/appsmith-ee/pull/4413
<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit
- **Refactor**
- Updated the method for merging changes to the master branch in Git
sync tests for improved reliability.
- **Tests**
- Revised Cypress test configurations and spec names for better
organization and clarity.
- Enhanced the `CheckMergeConflicts` method to improve test accuracy and
reliability by including element visibility checks and network status
assertions.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
1a0889e035