Conflicts: app/templates/layouts/profile.hbs assets/scripts/app/routes.coffee assets/scripts/app/views.coffee