Cleanup merge issues
Cleanup merge issues

fr500/mgba,Touched/mgba,fr500/mgba,nattthebear/mgba,Touched/mgba,libretro/mgba,libretro/mgba,MerryMage/mgba,matthewbauer/mgba,jeremyherbert/mgba,libretro/mgba,askotx/mgba,askotx/mgba,AdmiralCurtiss/mgba,mgba-emu/mgba,bentley/mgba,AdmiralCurtiss/mgba,Touched/mgba,sergiobenrocha2/mgba,iracigt/mgba,Anty-Lemon/mgba,bentley/mgba,sergiobenrocha2/mgba,askotx/mgba,Iniquitatis/mgba,jeremyherbert/mgba,mgba-emu/mgba,askotx/mgba,mgba-emu/mgba,AdmiralCurtiss/mgba,iracigt/mgba,Anty-Lemon/mgba,zerofalcon/mgba,sergiobenrocha2/mgba,fr500/mgba,jeremyherbert/mgba,MerryMage/mgba,Anty-Lemon/mgba,libretro/mgba,cassos/mgba,MerryMage/mgba,mgba-emu/mgba,jeremyherbert/mgba,cassos/mgba,iracigt/mgba,zerofalcon/mgba,iracigt/mgba,nattthebear/mgba,matthewbauer/mgba,zerofalcon/mgba,cassos/mgba,libretro/mgba,sergiobenrocha2/mgba,Iniquitatis/mgba,Iniquitatis/mgba,Anty-Lemon/mgba,fr500/mgba,sergiobenrocha2/mgba,Iniquitatis/mgba