merges profile/new.html.erb changes