handle conflict parts