start merge
refactor with new frw
fix chat room