Git Merge vs Rebase Conflicts: Key Differences and Fixes - Fix 'git pull failed index.lock file exists' Error-Python UTF-16 File Reading Error Fix

Result check
- Keep one change per test run so you know which step helped.
- Undo temporary changes after the issue is confirmed.