conflit modified