352_css.css removed
resolve merge conflict