grub: fix grub merge error
Merge pull request #3892 from robberer/bugfix/grub

grub: fix grub merge error