diff --git a/Gemfile.lock b/Gemfile.lock
index a6df760e4ee40ff94dd1ac6abbe9eff95b42fadb..fb2656c5d1e787812bf033f4d019315b6483dfa1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -952,12 +952,8 @@ DEPENDENCIES
   email_reply_trimmer (~> 0.1)
   email_spec (~> 1.6.0)
   factory_girl_rails (~> 4.7.0)
-<<<<<<< HEAD
-  faraday (~> 0.11.0)
-  faraday_middleware-aws-signers-v4
-=======
   faraday (~> 0.12)
->>>>>>> ce-com/master
+  faraday_middleware-aws-signers-v4
   ffaker (~> 2.4)
   flay (~> 2.8.0)
   flipper (~> 0.10.2)
diff --git a/db/schema.rb b/db/schema.rb
index 408099a2885af4f47c8cda7a856c07508d4a00e7..a3f6542d5a177358a17dd8aa337164f30c2e71b3 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,12 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-<<<<<<< HEAD
-ActiveRecord::Schema.define(version: 20170603200744) do
-
-=======
 ActiveRecord::Schema.define(version: 20170606202615) do
->>>>>>> ce-com/master
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
   enable_extension "pg_trgm"