Allow for merge conflicts in Merge-Branch.ps1 (#31727)
Allow for merge conflicts in Merge-Branch.ps1 (#31727)


Azure/azure-sdk-for-java,Azure/azure-sdk-for-java,Azure/azure-sdk-for-java,Azure/azure-sdk-for-java,Azure/azure-sdk-for-java