Conflict in Syria 'has not ended,' U.N. warns