added section on conflict, attempt to trim bibliography