non-makepkg-build fails: Merge conflict for cursoricon.c

non-makepkg-build.sh exit with error during "Hotfixing...", due to merge conflicts after reverting commit db2b266c57b... (user32: Handle monochrome icons in CreateIcon() and CreateCursor() instead of CreateIconIndirect().)

-> Using staging patchset
 -> Using fsync patchset
 -> Using pba patchset
 -> Cloning and preparing sources... Please be patient.
 -> Cleaning wine-staging source code tree...
 -> Cleaning wine source code tree...
 ==> WARNING: ! Staging has disabled mfplat support on this revision, so video playback will not work in games using mfplat !
 -> Changing wine HEAD to the wine-staging base commit...
Note: switching to '2f5f8b4bd4cb5771223d1ee96a55002d18ad01eb'.

You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by switching back to a branch.

If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -c with the switch command. Example:

  git switch -c <new-branch-name>

Or undo this operation with:

  git switch -

Turn off this advice by setting config variable advice.detachedHead to false

HEAD is now at 2f5f8b4bd4c Release 7.0-rc2.
 -> Using '/tmp/wine/community-patches' as community-patches repo root
 -> Updating community-patches repo...
From https://github.com/Frogging-Family/community-patches
 * branch            master     -> FETCH_HEAD
Already up to date.
 ==> WARNING: Hotfix: Fix for Riot Client updates
 ==> WARNING: Hotfix: Revert Quartz changes breaking Tokyo Xanadu Xe+
 ==> WARNING: Hotfix: Bcrypt fixes for RDR2
 ==> WARNING: Hotfix: Protonify staging syscall emu
 ==> WARNING: Hotfix: Remove a TRACE in the DXGIGetDebugInterface1 stub causing segfaults.
 -> Hotfixing...
error: could not revert db2b266c57b... user32: Handle monochrome icons in CreateIcon() and CreateCursor() instead of CreateIconIndirect().
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
 ==> ERROR: Patch application has failed. The error was logged to /tmp/wine/wine-tkg-git/wine-tkg-git/prepare.log for your convenience.
 -> To use the last known good mainline version, please set _plain_version="" in your .cfg
 -> To use the last known good staging version, please set _staging_version="" in your .cfg (requires _use_staging="true")
 -> Removed BIG_UGLY_FROGMINER - Ribbit
 -> Removed Proton-tkg token - Valve Ribbit
 -> exit cleanup done

From prepare.log:

db2b266c57b73e1a16785213ce923b749c84400e reverted 
Auto-merging dlls/user32/tests/cursoricon.c
CONFLICT (content): Merge conflict in dlls/user32/tests/cursoricon.c
Auto-merging dlls/user32/cursoricon.c
CONFLICT (content): Merge conflict in dlls/user32/cursoricon.c

NyanCatTW1 / robloxWineBuildGuide

non-makepkg-build fails: Merge conflict for cursoricon.c #11