Conflict test
Merge pull request #3 from guokrspace/test-branch-2

Conflict test