cc
merge conflict
Merge pull request #7 from friends110110/master

merge