conflicts resolved
add minified css