stash local conflicts to merge efi branch