You can upgrade with R9A036 but you can't skip FS,because FS + MAIN MUST be the same version and don't forget CUSTPACK- it must be the same region like FS. Just do full flash