Resolution conflit pt2