diff --git a/glide.lock b/glide.lock
index 69ee815..5164ff8 100644
--- a/glide.lock
+++ b/glide.lock
@@ -3,6 +3,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 hash: 2fe59efc96b0a2839297653da88cde89208f8f8cf4ced2bb1e828def57e3611b
 updated: 2017-07-19T11:33:58.0769452-04:00
 =======
@@ -23,6 +24,9 @@ updated: 2017-08-24T17:24:41.5846735-07:00
 >>>>>>> ea0c0b9... build: update glide files to point to latest btcsuite/btcd commits
 =======
 hash: cfe436dab405e09a50d3611edb83f5a238f71fd61c12ba7e47c2b02882a75cdf
+=======
+hash: a7b6593b62ad571ed749736405aa456bf2b6163f5d54e61241be56a7baaad6bd
+>>>>>>> a9231df... build: use neutrino with StartTime rescan option
 updated: 2017-08-29T15:22:10.322166424-07:00
 >>>>>>> e4e29cf... build: update glide files to point to latest btcd+neutrino
 imports:
@@ -141,7 +145,7 @@ imports:
 - name: github.com/kkdai/bstream
   version: f391b8402d23024e7c0f624b31267a89998fca95
 - name: github.com/lightninglabs/neutrino
-  version: 786bf194ce45d2619f23d7eafe90f23faf01b2f9
+  version: 68d076d252d5b32b514d2e7c86adbd31b01561b6
   subpackages:
   - filterdb
   - headerfs
diff --git a/glide.yaml b/glide.yaml
index d895193..edd54d4 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -18,7 +18,7 @@ import:
   subpackages:
   - hdkeychain
 - package: github.com/lightninglabs/neutrino
-  version: ebfb49168248d483e0a33580bb5eeafc5c52f19a
+  version: 68d076d252d5b32b514d2e7c86adbd31b01561b6
 - package: github.com/btcsuite/golangcrypto
   subpackages:
   - nacl/secretbox