merged application.coffee