cache: add note about where conflicts are handled
1 file changed