resolution bug deadlock
resolution conflit