# Conflicts:
#	.env
#	components/home/commonProblem.vue
#	components/home/presence.vue
#	components/home/projectFeatures.vue
#	components/home/schoolRanking.vue
#	components/layout/pc/Head.vue
#	components/rightAside.vue