# Conflicts:
#	ASM/build/asm_symbols.txt
#	ASM/build/bundle.o
#	ASM/build/c_symbols.txt
#	ASM/c/get_items.c
#	ASM/c/item_draw_functions.c
#	ASM/c/item_draw_functions.h
#	ASM/c/item_draw_table.c
#	ASM/c/item_table.c
#	ASM/c/item_upgrades.c
#	ASM/src/config.asm
#	CI.py
#	ItemList.py
#	data/generated/rom_patch.txt
#	data/generated/symbols.json
#	data/presets_default.json
#	data/settings_mapping.json