clean conflicts