solve confict