Test conflict.
Merge branch 'master' of https://github.com/rainbowCN/solution

Conflicts:
	plan/git/conflict.txt