Fixed Merge Problems From Dev To KonamiCode