fixed some orthographic mistakes
resolve merge conflict in n-player game