merge by hand (qla_os.c mismerge)