Clear conflicts