Просто чтобы избавиться от ошибки
пп
Merge remote-tracking branch 'origin/master'

Conflicts:
	TeamProjectTetris/TeamProjectTetris/TeamProjectTetris.csproj
	TeamProjectTetris/TeamProjectTetris/obj/Debug/App.g.i.cs

	TeamProjectTetris/TeamProjectTetris/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	TeamProjectTetris/TeamProjectTetris/obj/Debug/MainWindow.g.i.cs

	TeamProjectTetris/TeamProjectTetris/obj/Debug/TeamProjectTetris_MarkupCompile.i.cache