README: some words on conflict resolution