- Add autoResolveConflicts toggle to SettingsModal Merge section - Add unit tests for toggle functionality in SettingsModal - Clean up unrelated changeset files and unused components
- Add autoResolveConflicts toggle to SettingsModal Merge section - Add unit tests for toggle functionality in SettingsModal - Clean up unrelated changeset files and unused components