Update application.css
Merge conflict under users controller resolved