diff --git a/cli/glide.lock b/cli/glide.lock
index 2ffad3930..97f0693e7 100644
--- a/cli/glide.lock
+++ b/cli/glide.lock
@@ -1,10 +1,5 @@
-<<<<<<< 60da1c5f65dda96b9aeaeb2afbc513bf134a1990
-hash: da81ae46b9ef53596e8daaaa1aeb662af8704d77ae34ce2d33c7da87e6bd1ef5
-updated: 2017-08-09T23:25:49.919468872+03:00
-=======
 hash: fc16e358787292cb0b0d7f71adf4f0685b5994ca1c81788fdd056de21ebe7e55
 updated: 2017-08-18T21:34:47.686061147+03:00
->>>>>>> Updating CLI dependency: functions_go 0.1.37
 imports:
 - name: github.com/asaskevich/govalidator
   version: aa5cce4a76edb1a5acecab1870c17abbffb5419e