cleaning up code in new.html.erb
conflicts fixed