added section on conflict resolution