merge asus version of local-nb