Scroll bottom of chats work
Fixed merge conflicts
bump
merge db