git merge issues

kivilahtio@Vulcan:~/koha/kohaclone > git bz apply 11867
Bug 11867 - Multi transport types: Manage *_PHONE notices

25700 - Bug 11867: MTT: Manage *_PHONE notices

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 11867: MTT: Manage *_PHONE notices
Using index info to reconstruct a base tree...
M       installer/data/mysql/updatedatabase.pl
M       misc/cronjobs/thirdparty/TalkingTech_itiva_outbound.pl
Falling back to patching base and 3-way merge...
Auto-merging misc/cronjobs/thirdparty/TalkingTech_itiva_outbound.pl
CONFLICT (content): Merge conflict in misc/cronjobs/thirdparty/TalkingTech_itiva_outbound.pl
Auto-merging installer/data/mysql/updatedatabase.pl
Failed to merge in the changes.
Patch failed at 0001 Bug 11867: MTT: Manage *_PHONE notices
The copy of the patch that failed is found in:
   /home/kivilahtio/koha/kohaclone/.git/rebase-apply/patch
When you have resolved this problem run "git bz apply --continue".
If you would prefer to skip this patch, instead run "git bz apply --skip".
To restore the original branch and stop patching run "git bz apply --abort".
Patch left in /tmp/Bug-11867-MTT-Manage-PHONE-notices-xixSdx.patch

kivilahtio@Vulcan:~/koha/kohaclone > git bz apply --abort
error: cache entry has null sha1: misc/cronjobs/thirdparty/TalkingTech_itiva_outbound.pl
fatal: unable to write new index file
Unstaged changes after reset:
M       installer/data/mysql/atomicupdate/Bug-4246-Talking-Tech-itiva-phone-notifications.pl
M       installer/data/mysql/updatedatabase.pl
M       misc/cronjobs/thirdparty/TalkingTech_itiva_outbound.pl