diff --git a/glide.lock b/glide.lock
index 4539f5e09..bb0754900 100644
--- a/glide.lock
+++ b/glide.lock
@@ -3,6 +3,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 hash: b1cbcbd938a47a246b0d4d634037b76e63486c63e5867b339f92bcbd7453b75c
 updated: 2017-04-07T11:34:46.101385591+01:00
 =======
@@ -25,6 +26,10 @@ updated: 2017-03-02T14:57:08.032744661-07:00
 hash: 741ec5fae23f12e6c0fa0e4c7c00c0af06fac1ddc199dd4b45c904856890b347
 updated: 2017-03-15T10:48:05.202095822+01:00
 >>>>>>> 7c55a4f... Update github.com/containous/oxy only.
+=======
+hash: b689cb0faed68086641d9e3504ee29498e5bf06b088ad4fcd1e76543446d4d9a
+updated: 2017-03-27T14:29:54.009570184+02:00
+>>>>>>> 0d657a0... bump lego 0e2937900
 imports:
 - name: bitbucket.org/ww/goautoneg
   version: 75cd24fc2f2c2a2088577d12123ddee5f54e0675
@@ -197,7 +202,14 @@ imports:
 >>>>>>> 8392846... Update vulcand and pin deps in glide.yaml
 =======
   version: 9ed569b5d1ac936e6494082958d63a6aa4fff99a
+<<<<<<< HEAD
 >>>>>>> 7b1c0a9... Reset glide files to versions from upstream/v1.2.
+=======
+- name: github.com/dnsimple/dnsimple-go
+  version: eeb343928d9a3de357a650c8c25d8f1318330d57
+  subpackages:
+  - dnsimple
+>>>>>>> 0d657a0... bump lego 0e2937900
 - name: github.com/docker/distribution
   version: 325b0804fef3a66309d962357aac3c2ce3f4d329
   subpackages:
@@ -583,7 +595,11 @@ imports:
   - plugin/rewrite
   - router
 - name: github.com/xenolf/lego
+<<<<<<< HEAD
   version: 5dfe609afb1ebe9da97c9846d97a55415e5a5ccd
+=======
+  version: 0e2937900b224325f4476745a9b53aef246b7410
+>>>>>>> 0d657a0... bump lego 0e2937900
   subpackages:
   - acme
   - providers/dns