adding css
adding css/fixing merge