pulling master
merge conflict resolved
send message working, show all messages kinda working
message stable, not ready
merge conflict