Fixed Game1.cs merge errors