Controlling and Ending Conflict