fix git errors
fix git errors

FullScreenShenanigans/FullScreenPokemon,edwardpark/FullScreenPokemon,edwardpark/FullScreenPokemon,gpnoel/FullScreenPokemon,dlingenau/FullScreenPokemon,syo/FullScreenPokemon,gpnoel/FullScreenPokemon,dlingenau/FullScreenPokemon,syo/FullScreenPokemon,edwardpark/FullScreenPokemon,FullScreenShenanigans/FullScreenPokemon,dlingenau/FullScreenPokemon,gpnoel/FullScreenPokemon