Resolver factory

Moves conflict resolution stuff into a factory
    
    Step 2 of changes to the conversion and resolution changes. Just
    like converters, resolver instances are stored by classname in the factory.