[contributions:bradfordcp] /modules/conflict_resolver conflict_resolver.module