dumb mistake made in conflict resolution haste