First conflict resolution implementation.
It uses a global resolution mode (USER/GENERATION) for all conflicts.
The ConflictHandler isn't used yet.