fixing conflicts

.gitlab-ci.yml

README.md

app/builders/learning_object_builder.rb

app/controllers/concerns/publisher_controller.rb

app/controllers/v1/learning_objects_controller.rb

app/controllers/v1/questions_controller.rb

app/controllers/v1/search_controller.rb

app/controllers/v1/submissions_controller.rb

app/models/answer.rb

app/models/collection.rb

app/models/curator_assignment.rb

app/models/educational_stage.rb

app/models/learning_object.rb

app/models/object_type.rb

app/models/question.rb

app/models/review.rb

app/models/search.rb

app/models/subject.rb

app/models/submission.rb

app/models/tag.rb