[contributions:bradfordcp] /modules/conflict_resolver directory /modules/conflict_resolver - New