merging game code with server code
merge game file