diff --git a/.claude/rules/commit-conventions.md b/.claude/rules/commit-conventions.md
index 521a5a5e..00e0ea1c 100644
--- a/.claude/rules/commit-conventions.md
+++ b/.claude/rules/commit-conventions.md
@@ -1,4 +1,32 @@
-# Commit Message Format
+# Git Workflow & Commit Conventions
+
+## Branching
+
+**Always create new branches from `master`** (the main branch), not from feature branches:
+
+```bash
+# Correct workflow
+git checkout master
+git pull origin master
+git checkout -b fix/my-fix
+
+# Wrong - creates branch from current branch which may not be master
+git checkout -b fix/my-fix
+```
+
+Before creating a PR branch, always:
+1. Switch to `master`
+2. Pull latest changes
+3. Then create the new branch
+
+## Never Push Directly to Master
+
+**All changes must go through pull requests.** Never push commits directly to master, even for documentation changes. This ensures:
+- Code review for all changes
+- CI checks run before merge
+- Clean git history with traceable PRs
+
+## Commit Message Format
 
 All commits should follow the Conventional Commits specification to enable automatic changelog generation.
 
diff --git a/UnityProject/Packages/com.jasonxudeveloper.jengine.core/Runtime/Bootstrap.Common.cs b/UnityProject/Packages/com.jasonxudeveloper.jengine.core/Runtime/Bootstrap.Common.cs
index d645c51a..878808b0 100644
--- a/UnityProject/Packages/com.jasonxudeveloper.jengine.core/Runtime/Bootstrap.Common.cs
+++ b/UnityProject/Packages/com.jasonxudeveloper.jengine.core/Runtime/Bootstrap.Common.cs
@@ -92,7 +92,7 @@ public static async UniTask<SceneHandle> LoadHotUpdateScene(ResourcePackage pack
                 // Call error callback
                 await callbacks.OnError(e);
                 // Switch back to previous scene
-                await SceneManager.LoadSceneAsync(previousSceneName);
+                await SceneManager.LoadSceneAsync(previousSceneName).ToUniTask();
 
                 return null;
             }