$ git pull origin pokemon_expansion
From https://github.com/dizzyeggg/pokeemerald
 * branch                pokemon_expansion -> FETCH_HEAD
Auto-merging src/pokemon.c
CONFLICT (content): Merge conflict in src/pokemon.c
Auto-merging src/graphics.c
Removing src/data/pokemon_graphics/still_front_pic_table.h
Auto-merging src/data/pokemon/level_up_learnsets.h
CONFLICT (content): Merge conflict in src/data/pokemon/level_up_learnsets.h
Auto-merging src/data/pokemon/level_up_learnset_pointers.h
Removing src/data/pokemon/cry_ids.h
Auto-merging src/data/pokemon/base_stats.h
CONFLICT (content): Merge conflict in src/data/pokemon/base_stats.h
Auto-merging src/battle_main.c
Auto-merging src/battle_controller_wally.c
Auto-merging src/battle_controller_recorded_player.c
Auto-merging src/battle_controller_recorded_opponent.c
Auto-merging src/battle_controller_player_partner.c
Auto-merging src/battle_controller_player.c
Auto-merging src/battle_controller_opponent.c
Auto-merging src/battle_controller_link_partner.c
Auto-merging src/battle_controller_link_opponent.c
Auto-merging src/battle_anim_mons.c
Removing src/anim_mon_front_pics.c
Auto-merging ld_script.txt
Auto-merging include/pokemon.h
Auto-merging include/graphics.h
Auto-merging include/global.h
CONFLICT (content): Merge conflict in include/global.h
Auto-merging include/constants/pokemon.h
Auto-merging graphics_file_rules.mk
Removing graphics/pokemon/deoxys/icon_speed.png
Automatic merge failed; fix conflicts and then commit the result.