lala
resolution conflit