first has merge conflicts, I can review the second, but the choice is for @thor since I don't Windows 😉