conflit solved