Switched to a new branch '20230921075500.694585-1-den@openvz.org' Applying: parallels: fix formatting in bdrv_parallels initialization Using index info to reconstruct a base tree... M block/parallels.c Falling back to patching base and 3-way merge... Auto-merging block/parallels.c CONFLICT (content): Merge conflict in block/parallels.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 parallels: fix formatting in bdrv_parallels initialization 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".