[talk-ch] editor conflict