css/franja/rango ok
merge