edited game and main
edited merge conflicts