Updated for latest ConflictResolver