Applying: libavcodec/aarch64/hevcdsp_idct_neon.S: Also port add_residual functions.
Using index info to reconstruct a base tree...
A	libavcodec/aarch64/hevcdsp_idct_neon.S
A	libavcodec/aarch64/hevcdsp_init_aarch64.c
Falling back to patching base and 3-way merge...
Auto-merging libavcodec/aarch64/pixblockdsp_init_aarch64.c
CONFLICT (content): Merge conflict in libavcodec/aarch64/pixblockdsp_init_aarch64.c
CONFLICT (modify/delete): libavcodec/aarch64/hevcdsp_idct_neon.S deleted in HEAD and modified in libavcodec/aarch64/hevcdsp_idct_neon.S: Also port add_residual functions.. Version libavcodec/aarch64/hevcdsp_idct_neon.S: Also port add_residual functions. of libavcodec/aarch64/hevcdsp_idct_neon.S left in tree.
Patch failed at 0001 libavcodec/aarch64/hevcdsp_idct_neon.S: Also port add_residual functions.
Use 'git am --show-current-patch' to see the failed patch
When you have resolved this problem, run git am --continue.
If you prefer to skip this patch, run git am --skip instead.
To restore the original branch and stop patching, run git am --abort.