starting css
resolved conflicts