Conflicts: source/config.c source/firm.c source/fs.c source/fs.h source/patches.c source/patches.h source/utils.h