rolling out chat stuff
rolling out chat stuff / merging conflicts