ending those conflicts.. now