Resolve conflicts in Gemfile.lock and db/schema.rb

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

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)

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"