diff --git a/lib/todos.js b/lib/todos.js
index <HASH>..<HASH> 100644
--- a/lib/todos.js
+++ b/lib/todos.js
@@ -200,9 +200,7 @@ function getLanguage (filename /*, content */) {
 }
 
 function fromDiff (repo, diff, sha, conf) {
-  conf = _.merge({
-    "onProgress": _.noop
-  }, conf || {}, config.defaults);
+  conf = _.merge({ "onProgress": _.noop }, config.defaults, conf || {});
 
   var todos = _.flatten(_.map(diff, function (file) {
     var addedLines = _.filter(file.lines, "add");
FIX always using config defaults in fromDiff