Resolved conflicts:
- auth.sqlite: kept local version (important user data)
- server.rs: auto-merged successfully
Merged from remote:
- WebDAV performance fixes (OPTIONS/PROPFIND/PUT timeout)
- Incremental save implementation
- Web GUI features
Preserved from local:
- auth.sqlite user data
- Local WebDAV configurations