merged new text editing demo