merge dualboot

merge dualboot