Linux version
Conflict resolution
Linux version