last piece of css
resolved conflicts