Really fix Gemfile.lock conflicts
Commit to make sure nested attributes have the attr_accessible permission