In what year did the crisis nearly escalate into armed conflict