for merge, chating chat
chat_page re add
Merge branch 'dev' into ux