Switched to a new branch 'CAADuFnLOjiagCxFi._5FykwuU8XHqgnM2=Vo3X7oTYYN._5FcaLtsC+w@mail.gmail.com'
Applying: Support multiple USB HID keyboards/mice
Using index info to reconstruct a base tree...
M	src/hw/usb-hid.c
Falling back to patching base and 3-way merge...
Auto-merging src/hw/usb-hid.c
CONFLICT (content): Merge conflict in src/hw/usb-hid.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Support multiple USB HID keyboards/mice
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".