Moved call to merge from new.html.erb to _edit.html.erb
HW1-2 complete and Cucumber scenarios are both passing