Fix SDLCore merge error