solve conflic