cleanup
conflict application.coffee