updaded conflict results to include a threshold yes/no conflict