chat and usernames merged into master