resolve modify and add editor conflict