Update new.erb
fixed conflict