remove coflict