测试phpstorm解决冲突
解决冲突要研究的js.txt
Merge remote-tracking branch 'origin/master'

Conflicts:
	瑕佺爺绌剁殑js.txt
Merge remote-tracking branch 'origin/master'

Conflicts:
	ceshi.txt