editor conflict fix