Someone named Kelly has put together this nice little collection of XP KBs focused on solving conflict problems:

http://www.kellys-korner-xp.com/xp_conflicts.htm