test for conflict
Merge pull request #1 from pinguo-zhangzhi/dev

test for conflict