Refactoring Resources
Merge conflicts in Resources _form.html.erb