new game function
resolving merge conflict