text editor
merge