- Resolve file version conflict