pulling CSS
mergeing
division added
fix merge