diff --git a/CHANGELOG.md b/CHANGELOG.md
index 454ec1fec..90d1f2cee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,6 +29,7 @@ This section is for changes merged to the `major` branch that are not also merge
 - Command substitution output is now limited to 10 MB by default (#3822).
 - Added completions for
   - `j` (autojump #4344)
+  - `bd` (#4472)
 - Improved completions for
   - `git` (#4395, #4396)
 
@@ -88,7 +89,25 @@ Xcode builds and macOS packages could not be produced with 2.7b1, but this is fi
 - Lots of improvements to completions.
 - Updated Chinese and French translations.
 
+<<<<<<< Local Changes
+
+- Improved completions for:
+  - `apt`
+  - `cd` (#4061)
+  - `composer` (#4295)
+  - `flatpak` (#4456)
+  - `git` (#4117, #4147, #4329, #4368)
+  - `gphoto2`
+  - `killall` (#4052)
+  - `ln`
+  - `npm` (#4241)
+  - `ssh` (#4377)
+  - `tail`
+  - `xdg-mime` (#4333)
+  - `zypper` (#4325)
+=======
 ---
+>>>>>>> External Changes
 
 # fish 2.6.0 (released June 3, 2017)
 
diff --git a/share/completions/bd.fish b/share/completions/bd.fish
new file mode 100644
index 000000000..3e3805938
--- /dev/null
+++ b/share/completions/bd.fish
@@ -0,0 +1,19 @@
+#!/usr/bin/env fish
+# -*-  mode:fish; tab-width:4  -*-
+#
+# fish-completion for fish-bd
+# https://github.com/0rax/fish-bd
+#
+
+complete -c bd -A -f
+
+complete -c bd -s c    -d "Classic mode: goes back to the first directory named as the string"
+complete -c bd -s s    -d "Seems mode: goes back to the first directory containing string"
+complete -c bd -s i    -d "Case insensitive move (implies seems mode)"
+complete -c bd -s h -x -d "Display help and exit"
+
+function __fish_bd_complete_dirs
+    string split "/" -- $PWD
+end
+
+complete -c bd -a '(__fish_bd_complete_dirs)'