merge fixes
merge fixes v2
created gameLogPlayer on client