Refactored strong paramters usage and updated Gemfile.lock with Rails 4
Conflict resolved