- I messed up on conflict resolution