merge: new grub2