Added in-game chat
Fixed merge conflicts