no changes
conflict resolution
upgraded to Rails 3.2.11
could not troubleshoot file upload for seed.rb for test data