fix a long standing merge conflict in the bootloader record