chat stuff
merge
more merge