Issue compiling on linux mint, stopping on one of the hotfixes

[necrolatrynz]

Hi Guys probably an easy one/me doing something wrong,
Different to this issue #773

Getting this on the prepare.log when I run the non-makepkg-build.sh

Cloning into bare repository 'wine-mirror-git'...
Cloning into bare repository 'wine-staging-git'...
Fetching origin
Cloning into '/home/necrolatry/wine-tkg-git/wine-tkg-git/src/wine-staging-git'...
done.
Switched to a new branch 'makepkg'
Fetching origin
Cloning into '/home/necrolatry/wine-tkg-git/wine-tkg-git/src/wine-mirror-git'...
done.
Switched to a new branch 'makepkg'
HEAD is now at d8881486 Release v7.22
HEAD is now at 20d86f34a06 Release 7.22.

d75f651404028baa23d2591edf222837a167f790 reverted (hotfix)
Auto-merging dlls/bcrypt/bcrypt_main.c

d1291ebd4030c3ecc2f30199b963015077ab218c reverted (hotfix)
Auto-merging dlls/bcrypt/bcrypt_main.c

ec85dfe3ab9ba56fbe8b3c30ef393d470e292a36 reverted (hotfix)
Auto-merging dlls/bcrypt/bcrypt_main.c

6f5028dd03eba2cfffc8a844e482040d4ca29655 reverted (hotfix)
Auto-merging dlls/bcrypt/bcrypt_main.c
CONFLICT (content): Merge conflict in dlls/bcrypt/bcrypt_main.c

This is my terminal output

When you are ready, press enter to continue.
-> No _LOCAL_PRESET set in .cfg. Please select your desired base (or hit enter for default) :
==> WARNING: (mainline and staging options will make clean & untouched wine and wine-staging builds)
-> 0 - default-tkg
-> 1 - mainline
-> 2 - protonified
-> 3 - staging
-> 4 - valve
-> 5 - valve-exp-bleeding
-> 6 - other & legacy
choice [0-6]: 0
-> Using staging patchset
-> Using fsync patchset
-> Cloning and preparing sources... Please be patient.
-> Cleaning wine-staging source code tree...
-> Cleaning wine source code tree...
-> Changing wine HEAD to the wine-staging base commit...
-> Using patchinstall.sh --upstream-commit
HEAD is now at 20d86f34a06 Release 7.22.
==> WARNING: Hotfix: Fix for Riot Client updates
==> WARNING: Hotfix: Bcrypt fixes for RDR2
==> WARNING: Hotfix: Remove a TRACE in the DXGIGetDebugInterface1 stub causing segfaults.
==> WARNING: Hotfix: Fixup for Battle.net failing with a Qt error
==> WARNING: Hotfix: Fix for CL/opencl.h header recognition
-> cherry picking...
-> Hotfixing...
error: could not revert 6f5028dd03e... bcrypt: Add full support for algorithm pseudo-handles.
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add ' or 'git rm '
==> ERROR: Patch application has failed. The error was logged to /home/necrolatry/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

Seems to be an issue with bcrypt?

[necrolatrynz]

nvm set staging to false and it started compiling, musn't like the latest version