Development Snapshot of the Conflict Resolver module. This is being actively developed, while I will make every attempt to verify the code is stable before committing, this may not always be the case.
