some CSS
fixed merge