Resolve conflicts in Gemfile.lock

Gemfile.lock

@@ -441,13 +441,8 @@ GEM
     http_parser.rb (0.6.0)
     httparty (0.15.7)
       multi_xml (>= 0.5.2)
-<<<<<<< HEAD
     httpclient (2.8.3)
-    i18n (0.9.1)
-=======
-    httpclient (2.8.2)
     i18n (0.9.5)
->>>>>>> upstream/master
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     influxdb (0.2.3)
@@ -542,12 +537,8 @@ GEM
       mustermann (~> 1.0.0)
     mysql2 (0.4.10)
     net-ldap (0.16.0)
-<<<<<<< HEAD
     net-ntp (2.1.3)
-    net-ssh (4.1.0)
-=======
     net-ssh (4.2.0)
->>>>>>> upstream/master
     netrc (0.11.0)
     nokogiri (1.8.2)
       mini_portile2 (~> 2.3.0)
@@ -1147,12 +1138,8 @@ DEPENDENCIES
   mousetrap-rails (~> 1.4.6)
   mysql2 (~> 0.4.10)
   net-ldap
-<<<<<<< HEAD
   net-ntp
-  net-ssh (~> 4.1.0)
-=======
   net-ssh (~> 4.2.0)
->>>>>>> upstream/master
   nokogiri (~> 1.8.2)
   oauth2 (~> 1.4)
   octokit (~> 4.8)