diff --git a/go.mod b/go.mod
index 551ae808..51972763 100644
--- a/go.mod
+++ b/go.mod
@@ -1,12 +1,14 @@
 module github.com/nats-io/nats-server/v2
 
+go 1.14
+
 require (
 	github.com/nats-io/jwt v0.3.3-0.20200519195258-f2bf5ce574c7
 	github.com/nats-io/nats.go v1.10.0
 	github.com/golang/protobuf v1.3.5 // indirect
-	github.com/nats-io/nkeys v0.1.4
-	github.com/dustin/go-humanize v1.0.0
 	github.com/minio/highwayhash v1.0.0
+	github.com/nats-io/nkeys v0.1.4
+	github.com/nats-io/nuid v1.0.1
 	golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59
 	golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7
 )
diff --git a/go.sum b/go.sum
index e8f56942..f045dbec 100644
--- a/go.sum
+++ b/go.sum
@@ -12,7 +12,6 @@ github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/minio/highwayhash v1.0.0 h1:iMSDhgUILCr0TNm8LWlSjF8N0ZIj2qbO8WHp6Q/J2BA=
 github.com/minio/highwayhash v1.0.0/go.mod h1:xQboMTeM9nY9v/LlAOxFctujiv5+Aq2hR5dxBpaMbdc=
-github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg=
 github.com/nats-io/jwt v0.3.2 h1:+RB5hMpXUUA2dfxuhBTEkMOrYmM+gKIZYS1KjSostMI=
 github.com/nats-io/jwt v0.3.2/go.mod h1:/euKqTS1ZD+zzjYrY7pseZrTtWQSjujC7xjPc8wL6eU=
 github.com/nats-io/jwt v0.3.3-0.20200519195258-f2bf5ce574c7 h1:RnGotxlghqR5D2KDAu4TyuLqyjuylOsJiAFhXvMvQIc=
diff --git a/server/const.go b/server/const.go
index eab84069..1f71d18c 100644
--- a/server/const.go
+++ b/server/const.go
@@ -40,7 +40,7 @@ var (
 
 const (
 	// VERSION is the current version for the server.
-	VERSION = "2.2.0-beta.7"
+	VERSION = "2.2.0-beta.8"
 
 	// PROTO is the currently supported protocol.
 	// 0 was the original
diff --git a/test/leafnode_test.go b/test/leafnode_test.go
index e891da93..e89653df 100644
--- a/test/leafnode_test.go
+++ b/test/leafnode_test.go
@@ -1524,9 +1524,9 @@ func TestLeafNodeExportsImports(t *testing.T) {
 	// So everything should be setup here. So let's test streams first.
 	lsub, _ := ncl.SubscribeSync("import.foo.stream")
 
-	// Wait for the subs to propagate.
+	// Wait for all subs to propagate.
 	checkFor(t, time.Second, 10*time.Millisecond, func() error {
-		if subs := s.NumSubscriptions(); subs < 2 {
+		if subs := s.NumSubscriptions(); subs < 3 {
 			return fmt.Errorf("Number of subs is %d", subs)
 		}
 		return nil
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 4aea8648..088ccbaa 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -1,9 +1,21 @@
+<<<<<<< HEAD
+=======
+# github.com/golang/protobuf v1.3.5
+>>>>>>> Rebase with master, updates to go.mod and vendor, bumped version
 ## explicit
 # github.com/minio/highwayhash v1.0.0
+## explicit
 github.com/minio/highwayhash
+<<<<<<< HEAD
 # github.com/nats-io/jwt v0.3.3-0.20200519195258-f2bf5ce574c7
 github.com/nats-io/jwt
 # github.com/nats-io/nats.go v1.10.0
+=======
+# github.com/nats-io/jwt v0.3.2
+## explicit
+github.com/nats-io/jwt
+# github.com/nats-io/nats.go v1.9.2
+>>>>>>> Rebase with master, updates to go.mod and vendor, bumped version
 ## explicit
 github.com/nats-io/nats.go
 github.com/nats-io/nats.go/encoders/builtin
@@ -21,11 +33,16 @@ golang.org/x/crypto/blowfish
 golang.org/x/crypto/ed25519
 golang.org/x/crypto/ed25519/internal/edwards25519
 # golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7
+## explicit
+golang.org/x/sys/cpu
 golang.org/x/sys/windows
 golang.org/x/sys/windows/registry
 golang.org/x/sys/windows/svc
 golang.org/x/sys/windows/svc/eventlog
 golang.org/x/sys/windows/svc/mgr
+<<<<<<< HEAD
 # google.golang.org/protobuf v1.22.0
 ## explicit
 golang.org/x/sys/cpu
+=======
+>>>>>>> Rebase with master, updates to go.mod and vendor, bumped version