conflictResolver

The conflict resolver.