making some conflict
Merge pull request #4 from weaties/topic2

making some conflict