conflict resolution sucks