typo: getConflictResolver