Disagreements following the war have resulted in stalemate punctuated by periods of elevated tension and renewed threats of war. In what city is the UN based