fix keyenter
Merge branch 'chatroom'
fix conflict