cleanup conflict