North and South Korea to end war