new conflict types
Merge branch 'master' of https://github.com/marcinfr/magestore