Resolved very minor merge conflict with patstat
Resolved very minor merge conflict with patstat

dedupeio/dedupe-examples,nmiranda/dedupe,01-/dedupe,davidkunio/dedupe,01-/dedupe,dedupeio/dedupe,tfmorris/dedupe,tfmorris/dedupe,dedupeio/dedupe,pombredanne/dedupe,nmiranda/dedupe,davidkunio/dedupe,neozhangthe1/dedupe,neozhangthe1/dedupe,datamade/dedupe,datamade/dedupe,pombredanne/dedupe