fixes merge conflict in app.less