solve merge conflicts

Gemfile

app/controllers/concerns/downloadable_controller.rb

app/controllers/v1/collections_controller.rb

app/controllers/v1/learning_objects_controller.rb

app/controllers/v1/users/bookmarks_controller.rb

app/controllers/v1/users_controller.rb

app/models/collection.rb

app/models/concerns/downloadable.rb

app/models/concerns/sociable.rb

app/models/download.rb

app/models/learning_object.rb

app/models/package.rb

app/models/package_item.rb

app/models/user.rb

app/policies/user_policy.rb

app/serializers/follow_serializer.rb

app/serializers/learning_object_serializer.rb

app/serializers/user_serializer.rb

app/services/package_service.rb

app/services/package_service/generator.rb