fix merge conflict in app.css we should probably change this and not track app.css anymore it's basically a compiled artifact at this point