conflict2
fix conflicts
Merge pull request #26 from hao1987/MY_conflict2

conflict2