diff --git a/travis-api.gemspec b/travis-api.gemspec
index 8d25e9c8..c45d6326 100644
--- a/travis-api.gemspec
+++ b/travis-api.gemspec
@@ -18,14 +18,24 @@ Gem::Specification.new do |s|
     "Josh Kalderimis",
     "Henrik Hodne",
     "Steffen Kötte",
+<<<<<<< 692308837dce3cc05bc92489f0decfd9b27680be
     "Ana Rosas",
     "Tyranja",
     "Lennard Wolf",
     "Steffen",
     "Jonas Chromik",
+=======
+    "Tyranja",
+    "Lennard Wolf",
+    "Ana Rosas",
+    "Steffen",
+    "Jonas Chromik",
+    "Renée Hendricksen",
+>>>>>>> update the gemspec
     "Dan Buch",
     "Andre Arko",
     "Erik Michaels-Ober",
+<<<<<<< 692308837dce3cc05bc92489f0decfd9b27680be
     "C. Scott Ananian",
     "Christopher Weyand",
     "Lisa P",
@@ -36,6 +46,16 @@ Gem::Specification.new do |s|
     "Lucas CHERIFI",
     "Puneeth Chaganti",
     "Bryan Goldstein",
+=======
+    "Christopher Weyand",
+    "Lisa P",
+    "Brian Ford",
+    "Steve Richert",
+    "Nick Schonning",
+    "María de Antón",
+    "Puneeth Chaganti",
+    "Lucas CHERIFI",
+>>>>>>> update the gemspec
     "James Dennes",
     "Igor Wiedler",
     "rainsun",
@@ -44,7 +64,11 @@ Gem::Specification.new do |s|
     "Tim Carey-Smith",
     "Dan Rice",
     "Zachary Scott",
+<<<<<<< 692308837dce3cc05bc92489f0decfd9b27680be
     "María de Antón",
+=======
+    "Bryan Goldstein",
+>>>>>>> update the gemspec
     "Patrick Williams"
   ]
 
@@ -61,25 +85,47 @@ Gem::Specification.new do |s|
     "me@henrikhodne.com",
     "henrik@hodne.io",
     "carla@travis-ci.org",
+<<<<<<< 692308837dce3cc05bc92489f0decfd9b27680be
     "a.rosas10@gmail.com",
     "tyranja@cassiopeia.uberspace.de",
     "konstantin.haase@gmail.com",
     "lennardwolf@live.de",
     "steffen.koette@gmail.com",
     "Jonas.Chromik@student.hpi.uni-potsdam.de",
+=======
+    "tyranja@cassiopeia.uberspace.de",
+    "konstantin.haase@gmail.com",
+    "lennardwolf@live.de",
+    "a.rosas10@gmail.com",
+    "steffen.koette@gmail.com",
+    "Jonas.Chromik@student.hpi.uni-potsdam.de",
+    "renee@travis-ci.org",
+>>>>>>> update the gemspec
     "dan@travis-ci.org",
+    "andre@arko.net",
     "svenfuchs@artweb-design.de",
+<<<<<<< 692308837dce3cc05bc92489f0decfd9b27680be
     "andre@arko.net",
     "christopher.weyand@student.hpi.de",
     "sferik@gmail.com",
     "cscott@cscott.net",
+=======
+    "cscott@cscott.net",
+    "christopher.weyand@student.hpi.de",
+    "sferik@gmail.com",
+>>>>>>> update the gemspec
     "steve.richert@gmail.com",
     "bford@engineyard.com",
     "henrik@travis-ci.com",
     "mail@lislis.de",
+<<<<<<< 692308837dce3cc05bc92489f0decfd9b27680be
     "renee@travis-ci.org",
     "patrick@bittorrent.com",
     "rainsuner@gmail.com",
+=======
+    "rainsuner@gmail.com",
+    "patrick@bittorrent.com",
+>>>>>>> update the gemspec
     "nschonni@gmail.com",
     "MariadeAnton@users.noreply.github.com",
     "lucas@cherifi.info",
@@ -109,6 +155,43 @@ Gem::Specification.new do |s|
     "config/puma-config.rb",
     "config/ruby_config.sh",
     "config/unicorn.rb",
+    "core_specs/core/model/annotation_provider_spec.rb",
+    "core_specs/core/model/annotation_spec.rb",
+    "core_specs/core/model/broadcast_spec.rb",
+    "core_specs/core/model/build/compat_spec.rb",
+    "core_specs/core/model/build/config/dist_spec.rb",
+    "core_specs/core/model/build/config/group_spec.rb",
+    "core_specs/core/model/build/config/matrix_spec.rb",
+    "core_specs/core/model/build/config/obfuscate_spec.rb",
+    "core_specs/core/model/build/config_spec.rb",
+    "core_specs/core/model/build/denormalize_spec.rb",
+    "core_specs/core/model/build/matrix_spec.rb",
+    "core_specs/core/model/build/metrics_spec.rb",
+    "core_specs/core/model/build/result_message_spec.rb",
+    "core_specs/core/model/build/states_spec.rb",
+    "core_specs/core/model/build/update_branch_spec.rb",
+    "core_specs/core/model/build_spec.rb",
+    "core_specs/core/model/commit_spec.rb",
+    "core_specs/core/model/encrypted_column_spec.rb",
+    "core_specs/core/model/job/cleanup_spec.rb",
+    "core_specs/core/model/job/queue_spec.rb",
+    "core_specs/core/model/job/test_spec.rb",
+    "core_specs/core/model/job_spec.rb",
+    "core_specs/core/model/organization_spec.rb",
+    "core_specs/core/model/permission_spec.rb",
+    "core_specs/core/model/repository/settings/ssh_key_spec.rb",
+    "core_specs/core/model/repository/settings_spec.rb",
+    "core_specs/core/model/repository/status_image_spec.rb",
+    "core_specs/core/model/repository_spec.rb",
+    "core_specs/core/model/request/approval_spec.rb",
+    "core_specs/core/model/request/branches_spec.rb",
+    "core_specs/core/model/request/states_spec.rb",
+    "core_specs/core/model/request_spec.rb",
+    "core_specs/core/model/ssl_key_spec.rb",
+    "core_specs/core/model/token_spec.rb",
+    "core_specs/core/model/url_spec.rb",
+    "core_specs/core/model/user/oauth_spec.rb",
+    "core_specs/core/model/user_spec.rb",
     "lib/active_record_postgres_variables.rb",
     "lib/conditional_skylight.rb",
     "lib/tasks/build_update_branch.rake",
@@ -376,12 +459,6 @@ Gem::Specification.new do |s|
     "spec/integration/settings_endpoint_spec.rb",
     "spec/integration/singleton_settings_endpoint_spec.rb",
     "spec/integration/uptime_spec.rb",
-    "spec/integration/v1/branches_spec.rb",
-    "spec/integration/v1/builds_spec.rb",
-    "spec/integration/v1/hooks_spec.rb",
-    "spec/integration/v1/jobs_spec.rb",
-    "spec/integration/v1/repositories_spec.rb",
-    "spec/integration/v1_spec.backup.rb",
     "spec/integration/v2/branches_spec.rb",
     "spec/integration/v2/builds_spec.rb",
     "spec/integration/v2/hooks_spec.rb",
@@ -394,9 +471,13 @@ Gem::Specification.new do |s|
     "spec/integration/v2_spec.backup.rb",
     "spec/integration/version_spec.rb",
     "spec/spec_helper.rb",
+    "spec/spec_helper_core.rb",
+    "spec/support.rb",
+    "spec/support/active_record.rb",
     "spec/support/coverage.rb",
     "spec/support/formats.rb",
     "spec/support/matchers.rb",
+    "spec/support/payloads.rb",
     "spec/unit/access_token_spec.rb",
     "spec/unit/api/v2/http/accounts_spec.rb",
     "spec/unit/api/v2/http/annotations_spec.rb",