merge file, refactoring
attempt on merging games and chat