Looks like you've set this merge against the wrong branch, this is why you have so many conflicts. You'll want to resubmit this for lp:~ubuntu-core-dev/grub-installer/ubuntu.
« Back to merge proposal
Looks like you've set this merge against the wrong branch, this is why you have so many conflicts. You'll want to resubmit this for lp:~ubuntu-core-dev/grub-installer/ubuntu.