test resolution conflit