El Paso City and County Housing Authorities to merge