diff --git a/features.drush.inc b/features.drush.inc
index 0faa08f..58b00f1 100644
--- a/features.drush.inc
+++ b/features.drush.inc
@@ -88,6 +88,11 @@ function features_drush_command() {
     'drupal dependencies' => array('features', 'diff'),
     'aliases' => array('fd'),
   );
+  $items['features-conflicts'] = array(
+    'description' => "List all of the conflicted features for your site.",
+    'drupal dependencies' => array('features'),
+    'aliases' => array('fc', 'conflicts'),
+  );
 
   return $items;
 }
@@ -115,6 +120,8 @@ function features_drush_help($section) {
       return dt("Show a diff of a feature module.");
     case 'drush:features-add':
       return dt("Add a component to a feature module.");
+    case 'drush:features-conflict':
+      return dt("List of the conflicted features for your site.");
   }
 }
 
@@ -627,6 +634,31 @@ function drush_features_diff() {
 }
 
 /**
+ * Get a list of conflicted features.
+ */
+function drush_features_conflicts() {
+  module_load_include('inc', 'features', 'features.export');
+  $features = features_get_features();
+  $conflicts = features_get_conflicts();
+
+  $rows[] = array( dt('Feature'), dt('Conflict(s)'));
+  foreach ($features as $name => $module) {
+    if (!empty($conflicts[$name])) {
+      $module_conflicts = array();
+      foreach (array_keys($conflicts[$name]) as $conflict) {
+        $module_conflicts[] = $conflict;
+      }
+      $rows[] = array(
+        "{$module->info['name']} ({$module->name})", // Name (machine_name)
+        implode(', ', $module_conflicts),
+      );
+    }
+  }
+  drush_print_table($rows, TRUE);
+}
+
+
+/**
  * Helper function to call drush_set_error().
  *
  * @param $feature