Aid resumes as conflict abates