error: Your local changes to the following files would be overwritten by merge:
	resource/Arknights-Tile-Pos/overview.json
	resource/infrast.json
	resource/version.json
Please commit your changes or stash them before you merge.
error: The following untracked working tree files would be overwritten by merge:
	resource/Arknights-Tile-Pos/act45side_ex01#f#-activities-act45side-level_act45side_ex01.json
	resource/Arknights-Tile-Pos/act45side_ex01-activities-act45side-level_act45side_ex01.json
	resource/Arknights-Tile-Pos/act45side_ex02#f#-activities-act45side-level_act45side_ex02.json
	resource/Arknights-Tile-Pos/act45side_ex02-activities-act45side-level_act45side_ex02.json
	resource/Arknights-Tile-Pos/act45side_ex03#f#-activities-act45side-level_act45side_ex03.json
	resource/Arknights-Tile-Pos/act45side_ex03-activities-act45side-level_act45side_ex03.json
	resource/Arknights-Tile-Pos/act45side_ex04#f#-activities-act45side-level_act45side_ex04.json
	resource/Arknights-Tile-Pos/act45side_ex04-activities-act45side-level_act45side_ex04.json
	resource/Arknights-Tile-Pos/act45side_ex05#f#-activities-act45side-level_act45side_ex05.json
	resource/Arknights-Tile-Pos/act45side_ex05-activities-act45side-level_act45side_ex05.json
	resource/Arknights-Tile-Pos/act45side_ex06#f#-activities-act45side-level_act45side_ex06.json
	resource/Arknights-Tile-Pos/act45side_ex06-activities-act45side-level_act45side_ex06.json
	resource/Arknights-Tile-Pos/act45side_ex07#f#-activities-act45side-level_act45side_ex07.json
	resource/Arknights-Tile-Pos/act45side_ex07-activities-act45side-level_act45side_ex07.json
	resource/Arknights-Tile-Pos/act45side_ex08#f#-activities-act45side-level_act45side_ex08.json
	resource/Arknights-Tile-Pos/act45side_ex08-activities-act45side-level_act45side_ex08.json
Please move or remove them before you merge.
Aborting
Updating 60e69ec..5c3383c
Error: Failed to pull resource repository

Caused by:
    Command failed