Distribution version of css
Resolving conflicts