fix conflict
Merge pull request #5 from linbercsu/test3

fix conflict