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