remove conflcit