Game1.cs merged manually