Fix conflicts in Gemfile.rails5.lock

Gemfile.rails5.lock

@@ -73,7 +73,6 @@ GEM
       encryptor (~> 3.0.0)
     attr_required (1.0.0)
     awesome_print (1.8.0)
-<<<<<<< HEAD
     aws-sdk (2.11.64)
       aws-sdk-resources (= 2.11.64)
     aws-sdk-core (2.11.64)
@@ -82,8 +81,6 @@ GEM
     aws-sdk-resources (2.11.64)
       aws-sdk-core (= 2.11.64)
     aws-sigv4 (1.0.2)
-=======
->>>>>>> upstream/master
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
@@ -192,7 +189,6 @@ GEM
     dropzonejs-rails (0.7.2)
       rails (> 3.1)
     ed25519 (1.2.4)
-<<<<<<< HEAD
     elasticsearch (5.0.3)
       elasticsearch-api (= 5.0.3)
       elasticsearch-transport (= 5.0.3)
@@ -206,8 +202,6 @@ GEM
     elasticsearch-transport (5.0.3)
       faraday
       multi_json
-=======
->>>>>>> upstream/master
     email_reply_trimmer (0.1.6)
     email_spec (2.2.0)
       htmlentities (~> 4.3.3)
@@ -547,10 +541,7 @@ GEM
       mustermann (~> 1.0.0)
     mysql2 (0.4.10)
     net-ldap (0.16.0)
-<<<<<<< HEAD
     net-ntp (2.1.3)
-=======
->>>>>>> upstream/master
     net-ssh (5.0.1)
     netrc (0.11.0)
     nio4r (2.3.1)