question1.3
resolution conflit