Solve confict