Syrian ex-rebel factions agree to merge under defence ministry