diff --git a/README.md b/README.md
index e6b42fd78..e72529c45 100644
--- a/README.md
+++ b/README.md
@@ -152,6 +152,7 @@ If you aren't using any zsh frameworks, or if you're a bash user, do the followi
 | `git-changes` | Michael Markert's [dotfiles](https://github.com/cofi/dotfiles) | List authors in the repo in descending commit-count order |
 | `git-churn` | Gary Bernhardt's [dotfiles](https://github.com/garybernhardt/dotfiles/blob/master/bin/git-churn) | Show which files are getting changed most often in the repository |
 | `git-clone-subset` | Rodrigo Silva (MestreLion) <linux@rodrigosilva.com> | Uses `git clone` and `git filter-branch` to remove from the clone all files but the ones requested, along with their associated commit history. |
+| `git-conflicts` | Seth Messer's [bits and bobs](https://github.com/megalithic/bits-and-bobs/) repo | Show files with conflicts |
 | `git-copy-branch-name` | Zach Holman's [dotfiles](https://github.com/holman/dotfiles) | Copy the current branch name to the clipboard (OS X Only) |
 | `git-credit` | Zach Holman's [dotfiles](https://github.com/holman/dotfiles) | Quicker way to assign credit to another author on the latest commit|
 | `git-cut-branch` | Ryan Tomayko's [dotfiles](https://github.com/rtomayko/dotfiles) | Create a new branch pointed at HEAD and reset the current branch to the head of its tracking branch |
diff --git a/bin/git-conflicts b/bin/git-conflicts
new file mode 100755
index 000000000..3997b5a69
--- /dev/null
+++ b/bin/git-conflicts
@@ -0,0 +1,6 @@
+#!/bin/sh
+# Usage: git-conflicts
+# Show list of files in a conflict state.
+# Original: https://github.com/megalithic/bits-and-bobs/blob/master/bin/git-conflicts
+# Author: Seth Messer
+git ls-files -u | awk '{print $4}' | sort -u