conflict end