text fix
merge