conflit resolved