text layout
after merge