Solve conflic