Aleppo battle ends as Syria rebel deal reached