Landed candidate fixes for both issues, let me know if that resolved it for you.
The various branches with fixes on them are managed with git, it has a system for resolving the vast majority of conflicts that arise due to the same files being modified by different people, and has tools to help the maintainers resolve conflicts when they aren’t trivial.
Basically it keeps track of the difference between the original code and all of the various edits to the code, and lets someone (me or another maintainer in this case) apply them in an arbitrary order.