fixinf text area issue
merge conflicts