solve conflit