Modification AI
merge conflit