Fix conflict[] => conflicts[] typo.