Remove this define:
#define KEEP_SAVEFILES_WHEN_PROGRAMMING
You most likely have something in your .ini files from the last upload that conflicts with the newly uploaded OS. Remove this define and try again.
Only use this define IF you fully understand what it is doing: