Delete application.css (Thomas’s MacBook Pro's conflicted copy 2014-12-23).map