add editor
merge