What if applying the patch doesn't work?
You can resolve the conflict
git status emacs app/lib/conflicted-file.pm git add app/lib/conflicted-file.pm git cherry-pick --continue
