El Paso's City Manager will stay until contract ends