error on 3rd part of fix

wild@ubuntu:~/src/omni/packages/apps/Settings$ git fetch https://gerrit.omnirom.org/android_packages_apps_Settings refs/changes/86/1686/5 && git cherry-pick FETCH_HEAD
remote: Counting objects: 21, done
remote: Finding sources: 100% (12/12)
remote: Total 12 (delta 9), reused 12 (delta 9)
Unpacking objects: 100% (12/12), done.
From https://gerrit.omnirom.org/android_packages_apps_Settings
 * branch            refs/changes/86/1686/5 -> FETCH_HEAD
[detached HEAD 32679e7] PA PIE (2/3)
 Author: mithun46 <[email protected]>
 5 files changed, 22 insertions(+)
 create mode 100644 res/drawable-hdpi/ic_omni_pie.png
 create mode 100644 res/drawable-xhdpi/ic_omni_pie.png
wild@ubuntu:~/src/omni/packages/apps/Settings$ cd ..\
> ^C
wild@ubuntu:~/src/omni/packages/apps/Settings$ cd ..
wild@ubuntu:~/src/omni/packages/apps$ cd OmniGears
wild@ubuntu:~/src/omni/packages/apps/OmniGears$ git fetch https://gerrit.omnirom.org/android_packages_apps_OmniGears refs/changes/90/1690/4 && git cherry-pick FETCH_HEAD
remote: Counting objects: 34, done
remote: Finding sources: 100% (24/24)
remote: Total 24 (delta 7), reused 24 (delta 7)
Unpacking objects: 100% (24/24), done.
From https://gerrit.omnirom.org/android_packages_apps_OmniGears
 * branch            refs/changes/90/1690/4 -> FETCH_HEAD
error: could not apply e559a23... PA PIE (3/3)
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
Recorded preimage for 'res/values/custom_strings.xml'