bios fix
merge