libretro merge fix