'Emergency' ends in Ethiopia — but not the war