diff --git a/Cargo.toml b/Cargo.toml
index 77fd7245c..bebbd2421 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -18,10 +18,10 @@ members = ["crates/nu-errors", "crates/nu-source", "crates/nu-textview", "crates
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nu-source = { path = "./crates/nu-source" }
-nu-protocol = { path = "./crates/nu-protocol" }
-nu-errors = { path = "./crates/nu-errors" }
-nu-parser = { path = "./crates/nu-parser" }
+nu-source = { version = "0.1.0", path = "./crates/nu-source" }
+nu-protocol = { version = "0.1.0", path = "./crates/nu-protocol" }
+nu-errors = { version = "0.1.0", path = "./crates/nu-errors" }
+nu-parser = { version = "0.1.0", path = "./crates/nu-parser" }
 
 query_interface = "0.3.5"
 typetag = "0.1.4"
diff --git a/docs/commands/config.md b/docs/commands/config.md
index 3998b0dea..ad868b760 100644
--- a/docs/commands/config.md
+++ b/docs/commands/config.md
@@ -29,13 +29,24 @@ Syntax: `config {flags}`
 
 ### Variables
 
-| Variable   | Type             | Description                                             |
+<<<<<<< HEAD
+| Variable | Type | Description |
 | ---------- | ---------------- | ------------------------------------------------------- |
-| path       | table of strings | PATH to use to find binaries                            |
-| env        | row              | the environment variables to pass to external commands  |
-| ctrlc_exit | boolean          | whether or not to exit Nu after multiple ctrl-c presses |
-| table_mode | "light" or other | enable lightweight or normal tables                     |
-| edit_mode  | "vi" or "emacs"  | changes line editing to "vi" or "emacs" mode            |
+| path | table of strings | PATH to use to find binaries |
+| env | row | the environment variables to pass to external commands |
+| ctrlc_exit | boolean | whether or not to exit Nu after multiple ctrl-c presses |
+| table_mode | "light" or other | enable lightweight or normal tables |
+| edit_mode | "vi" or "emacs" | changes line editing to "vi" or "emacs" mode |
+=======
+| Variable | Type | Description |
+| ------------- | ------------- | ----- |
+| path | table of strings | PATH to use to find binaries |
+| env | row | the environment variables to pass to external commands |
+| ctrlc_exit | boolean | whether or not to exit Nu after multiple ctrl-c presses |
+| table_mode | "light" or other | enable lightweight or normal tables |
+| edit_mode | "vi" or "emacs" | changes line editing to "vi" or "emacs" mode |
+
+> > > > > > > origin/master
 
 ## Examples