started css
fixed conflict