merge conflict message removed from user.css
user.css is organized by section on the page