plugin conflict fix