You should be uploading Marlin RCBugFix found here for the easiest path forward: https://github.com/MarlinFirmware/Marlin/tree/RCBugFix