Fix Missing Edge Sync Option in Settings - Handling Git Merge Conflicts in Lockfiles-Git Merge Conflict Prevention Checklist

Final checklist
- Confirm that the same symptom is gone after a restart or refresh.
- Keep the smallest working change and undo temporary diagnostic settings.