better matching for cou ting conflicts
Merge branch 'master' of git://git.code.sf.net/p/magmi/git