conflict trends