Resolving conflicts in style.css