typos
merge the text modules