chore: update merge conflict bot message with web editor tips (hiero-ledger#1608)

Signed-off-by: RKNAGA18 <[email protected]>
Signed-off-by: R NAGA ARJUN <[email protected]>

Author: RKNAGA18

.github/scripts/bot-merge-conflict.js

@@ -44,8 +44,7 @@ module.exports = async ({ github, context, core }) => {
       return;
     }
 
-    const body = `Hi, this is MergeConflictBot.\nYour pull request cannot be merged because it contains **merge conflicts**.\n\nPlease resolve these conflicts locally and push the changes.\n\nTo assist you, please read:\n- [Resolving Merge Conflicts](https://github.com/${owner}/${repo}/blob/main/docs/sdk_developers/merge_conflicts.md)\n- [Rebasing Guide](https://github.com/${owner}/${repo}/blob/main/docs/sdk_developers/rebasing.md)\n\nThank you for contributing!\n<!-- \nFrom the Hiero Python SDK Team\n${BOT_SIGNATURE} -->`;
-
+    const body = `Hi, this is MergeConflictBot.\nYour pull request cannot be merged because it contains **merge conflicts**.\n\nPlease resolve these conflicts locally and push the changes.\n\n### Quick Fix for CHANGELOG.md Conflicts\nIf your conflict is only in **CHANGELOG.md**, you can resolve it easily using the [GitHub web editor](https://docs.github.com/en/codespaces/the-githubdev-web-based-editor):\n1. Click on the "Resolve conflicts" button in the PR\n2. Accept both changes (keep both changelog entries)\n3. Click "Mark as resolved"\n4. Commit the merge\n\nFor all other merge conflicts, please read:\n- [Resolving Merge Conflicts](https://github.com/${owner}/${repo}/blob/main/docs/sdk_developers/merge_conflicts.md)\n- [Rebasing Guide](https://github.com/${owner}/${repo}/blob/main/docs/sdk_developers/rebasing.md)\n\nThank you for contributing!\n<!-- \nFrom the Hiero Python SDK Team\n${BOT_SIGNATURE} -->`;
     if (dryRun) {
       console.log(`[DRY RUN] Would post comment to PR #${prNumber}: ${body}`);
       return;

CHANGELOG.md

@@ -222,6 +222,8 @@ This changelog is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.
 - Enhance TopicInfo `__str__` method and tests with additional coverage, and update the format_key function in `key_format.py` to handle objects with a \_to_proto method.
 - Update changelog workflow to trigger automatically on pull requests instead of manual dispatch (#1567)
 - Formatted key-related unit test files (`key_utils_test.py`, `test_key_format.py`, `test_key_list.py`) using the black formatter
+- chore: update maintainer guidelines link in MAINTAINERS.md (#1605)
+- chore: update merge conflict bot message with web editor tips (#1592)
 
 ### Fixed
 - Fix the next-issue recommendation bot to post the correct issue recommendation comment. (#1593)