Conflicts: public/javascripts/new_user.js public/stylesheets/header.css public/stylesheets/new_user.css