discussion of dangling-else-conflict has been rewritten and extended
edited the sections discussing conflicts in chapter on cup