working on conflict