Added conflict generation