redesign chat
merge origin