# Conflicts:
#	src/components/activity/treasure-box/treasure-box/team.js
#	src/router/router-config.js